Ticket #2661: mc-4.8.10-editor-paste-newline-tab.patch

lib/tty/key.c

@@ -326 +326 @@
     {KEY_M_SHIFT | KEY_M_CTRL | KEY_DOWN, ESC_STR "[1;6B", MCKEY_NOACTION},
     {KEY_M_SHIFT | KEY_M_CTRL | KEY_RIGHT, ESC_STR "[1;6C", MCKEY_NOACTION},
     {KEY_M_SHIFT | KEY_M_CTRL | KEY_LEFT, ESC_STR "[1;6D", MCKEY_NOACTION},
+    {KEY_M_SHIFT | '\t', ESC_STR "[Z", MCKEY_NOACTION},
 
     /* putty */
     {KEY_M_SHIFT | KEY_M_CTRL | KEY_UP, ESC_STR "[[1;6A", MCKEY_NOACTION},
@@ -1008 +1009 @@
     if (c == KEY_SCANCEL)
         c = '\t';
 
-    /* Convert Shift+Tab and Ctrl+Tab to Back Tab
-     * only if modifiers directly from X11
-     */
-#ifdef HAVE_TEXTMODE_X11_SUPPORT
-    if (x11_window != 0)
-#endif /* HAVE_TEXTMODE_X11_SUPPORT */
-    {
-        if ((c == '\t') && (mod & (KEY_M_SHIFT | KEY_M_CTRL)))
-        {
-            c = KEY_BTAB;
-            mod = 0;
-        }
+    /* Convert Back Tab to Shift+Tab */
+    if (c == KEY_BTAB) {
+        c = '\t';
+        mod = KEY_M_SHIFT;
     }
 
     /* F0 is the same as F10 for out purposes */

lib/widget/dialog.c

@@ -493 +493 @@
             dlg_one_down (h);
             return;
         }
-        else if (d_key == KEY_BTAB)
+        else if ((d_key & ~(KEY_M_SHIFT | KEY_M_CTRL)) == '\t')
         {
             dlg_one_up (h);
             return;

misc/mc.default.keymap

@@ -227 +227 @@
 WordLeft = ctrl-left; ctrl-z
 WordRight = ctrl-right; ctrl-x
 Enter = enter
-Return = shift-enter
+Return = shift-enter; ctrl-enter; ctrl-shift-enter
 BackSpace = backspace; ctrl-h
 Delete = delete; ctrl-d
 PageUp = pgup
 PageDown = pgdn
 Home = home
 End = end
-Tab = tab
+Tab = tab; shift-tab; ctrl-tab; ctrl-shift-tab
 Undo = ctrl-u
 Redo = alt-r
 Top = ctrl-home; alt-lt

misc/mc.emacs.keymap

@@ -227 +227 @@
 WordLeft = ctrl-left; alt-b
 WordRight = ctrl-right; alt-f
 Enter = enter
-Return = shift-enter
+Return = shift-enter; ctrl-enter; ctrl-shift-enter
 BackSpace = backspace
 Delete = delete
 PageUp = pgup; alt-v
 PageDown = pgdn; ctrl-v
 Home = home; ctrl-a
 End = end; ctrl-e
-Tab = tab
+Tab = tab; shift-tab ctrl-tab; ctrl-shift-tab
 Undo = ctrl-u
 # Redo =
 Top = ctrl-home; alt-lt

misc/mc.keymap

@@ -227 +227 @@
 WordLeft = ctrl-left; ctrl-z
 WordRight = ctrl-right; ctrl-x
 Enter = enter
-Return = shift-enter
+Return = shift-enter; ctrl-enter; ctrl-shift-enter
 BackSpace = backspace; ctrl-h
 Delete = delete; ctrl-d
 PageUp = pgup
 PageDown = pgdn
 Home = home
 End = end
-Tab = tab
+Tab = tab; shift-tab; ctrl-tab; ctrl-shift-tab
 Undo = ctrl-u
 Redo = alt-r
 Top = ctrl-home; alt-lt

src/keybind-defaults.c

@@ -320 +320 @@
 #ifdef USE_INTERNAL_EDIT
 static const global_keymap_ini_t default_editor_keymap[] = {
     {"Enter", "enter"},
-    {"Return", "shift-enter"},  /* useful for pasting multiline text */
-    {"Tab", "tab"},
+    {"Return", "shift-enter; ctrl-enter; ctrl-shift-enter"},  /* useful for pasting multiline text */
+    {"Tab", "tab; shift-tab; ctrl-tab; ctrl-shift-tab"},  /* ditto */
     {"BackSpace", "backspace; ctrl-h"},
     {"Delete", "delete; ctrl-d"},
     {"Left", "left"},