From c7ff70090cc2e6312df70b7a94974fb033790420 Mon Sep 17 00:00:00 2001
From: Vit Rosin <vit_r@list.ru>
Date: Sun, 8 Nov 2009 23:42:39 +0000
Subject: [PATCH] Alt-d_Date-hotkey
---
autogen.sh | 2 ++
edit/edit.c | 1 +
misc/mc.keymap.default | 7 +++----
misc/mc.keymap.emacs | 7 +++----
src/keybind.c | 11 +++++++----
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index c93fc2f..5240717 100755
a
|
b
|
$srcdir/maint/version.sh "$srcdir" |
89 | 89 | if test -x $srcdir/configure.mc; then |
90 | 90 | $srcdir/configure.mc "$@" |
91 | 91 | fi |
| 92 | |
| 93 | echo -e "\n $PWD/$0: $LINENO: \n\n D O N E \n" |
diff --git a/edit/edit.c b/edit/edit.c
index e239c0c..9a51b79 100644
a
|
b
|
edit_execute_cmd (WEdit *edit, int command, int char_for_insertion) |
3120 | 3120 | break; |
3121 | 3121 | case CK_Edit_Save_Mode: |
3122 | 3122 | menu_save_mode_cmd (); |
| 3123 | break; |
3123 | 3124 | case CK_Date: |
3124 | 3125 | { |
3125 | 3126 | char s[BUF_MEDIUM]; |
diff --git a/misc/mc.keymap.default b/misc/mc.keymap.default
index 7b76a58..606e61e 100644
a
|
b
|
EditScrollDown = ctrl-down |
30 | 30 | EditBeginPage = ctrl-home |
31 | 31 | EditEndPage = ctrl-end |
32 | 32 | EditDeleteWordLeft = alt-backspace |
33 | | EditDeleteWordRight = alt-d |
| 33 | EditDeleteWordRight = alt-delete |
34 | 34 | EditParagraphUp = |
35 | 35 | EditParagraphDown = |
36 | 36 | EditSave = f2 |
… |
… |
EditInsertFile = f15 |
105 | 105 | EditQuit = f10 |
106 | 106 | EditToggleInsert = insert |
107 | 107 | EditHelp = f1 |
108 | | EditDate = |
| 108 | EditDate = alt-d |
109 | 109 | EditRefresh = ctrl-l |
110 | 110 | EditGoto = alt-l |
111 | 111 | EditManPage = |
… |
… |
InputMoveRight = right; alt-right |
293 | 293 | InputWordRight = ctrl-right |
294 | 294 | InputForwardChar = ctrl-f |
295 | 295 | InputForwardWord = alt-f |
296 | | |
297 | 296 | InputBackwardDelete = backspace |
298 | 297 | InputDeleteChar = delete |
299 | | InputKillWord = alt-d |
| 298 | InputKillWord = alt-delete |
300 | 299 | InputBackwardKillWord = alt-backspace |
301 | 300 | InputSetMark = |
302 | 301 | InputKillRegion = ctrl-w |
diff --git a/misc/mc.keymap.emacs b/misc/mc.keymap.emacs
index 8de5b3f..25d4fa9 100644
a
|
b
|
EditScrollDown = ctrl-down |
30 | 30 | EditBeginPage = ctrl-home |
31 | 31 | EditEndPage = ctrl-end |
32 | 32 | EditDeleteWordLeft = alt-backspace |
33 | | EditDeleteWordRight = alt-d |
| 33 | EditDeleteWordRight = alt-delete |
34 | 34 | EditParagraphUp = |
35 | 35 | EditParagraphDown = |
36 | 36 | EditSave = f2 |
… |
… |
EditInsertFile = f15 |
104 | 104 | EditQuit = f10 |
105 | 105 | EditToggleInsert = insert |
106 | 106 | EditHelp = f1 |
107 | | EditDate = |
| 107 | EditDate = alt-d |
108 | 108 | EditRefresh = ctrl-l |
109 | 109 | EditGoto = alt-l |
110 | 110 | EditManPage = |
… |
… |
InputMoveRight = right; alt-right |
297 | 297 | InputWordRight = ctrl-right |
298 | 298 | InputForwardChar = ctrl-f |
299 | 299 | InputForwardWord = alt-f |
300 | | |
301 | 300 | InputBackwardDelete = backspace |
302 | 301 | InputDeleteChar = delete |
303 | | InputKillWord = alt-d |
| 302 | InputKillWord = alt-delete |
304 | 303 | InputBackwardKillWord = alt-backspace |
305 | 304 | InputSetMark = |
306 | 305 | InputKillRegion = ctrl-w |
diff --git a/src/keybind.c b/src/keybind.c
index c898e8c..5600743 100644
a
|
b
|
|
42 | 42 | #include "tty/tty.h" /* keys */ |
43 | 43 | #include "wtools.h" |
44 | 44 | #include "strutil.h" |
45 | | |
46 | 45 | #include "keybind.h" |
47 | 46 | |
48 | 47 | static const name_keymap_t command_names[] = { |
… |
… |
const global_keymap_t default_editor_keymap[] = { |
501 | 500 | |
502 | 501 | { ALT ('\n'), CK_Find_Definition, "M-Enter" }, |
503 | 502 | { ALT ('\t'), CK_Complete_Word, "M-Tab" }, |
| 503 | { ALT ('e'), CK_SelectCodepage, "M-e" }, |
504 | 504 | { ALT ('l'), CK_Goto, "M-l" }, |
505 | 505 | { ALT ('L'), CK_Goto, "M-L" }, |
506 | 506 | { ALT ('p'), CK_Paragraph_Format, "M-p" }, |
… |
… |
const global_keymap_t default_editor_keymap[] = { |
510 | 510 | { ALT ('>'), CK_End_Of_Text, "M->" }, |
511 | 511 | { ALT ('-'), CK_Load_Prev_File, "M--" }, |
512 | 512 | { ALT ('+'), CK_Load_Next_File, "M-+" }, |
513 | | { ALT ('d'), CK_Delete_Word_Right, "M-d" }, |
| 513 | { ALT ('D'), CK_Date, "M-D" }, |
| 514 | { ALT ('d'), CK_Date, "M-d" }, |
514 | 515 | { ALT (KEY_BACKSPACE), CK_Delete_Word_Left, "M-BackSpace" }, |
| 516 | { ALT (KEY_DC), CK_Delete_Word_Right, "M-Delete" }, |
515 | 517 | { ALT ('n'), CK_Toggle_Line_State, "M-n" }, |
516 | 518 | { ALT ('_'), CK_Toggle_Tab_TWS, "M-_" }, |
517 | 519 | { ALT ('k'), CK_Toggle_Bookmark, "M-k" }, |
… |
… |
const global_keymap_t default_editor_keymap[] = { |
525 | 527 | { XCTRL ('o'), CK_Shell, "C-o" }, |
526 | 528 | { XCTRL ('s'), CK_Toggle_Syntax, "C-s" }, |
527 | 529 | { XCTRL ('u'), CK_Undo, "C-u" }, |
528 | | { ALT ('e'), CK_SelectCodepage, "M-e" }, |
529 | 530 | { XCTRL ('q'), CK_Insert_Literal, "C-q" }, |
530 | 531 | { XCTRL ('r'), CK_Begin_End_Macro, "C-r" }, |
531 | 532 | { XCTRL ('r'), CK_Begin_Record_Macro, "C-r" }, |
… |
… |
const global_keymap_t default_input_keymap[] = { |
749 | 750 | /* Editing */ |
750 | 751 | { KEY_BACKSPACE, CK_InputBackwardDelete, "BackSpace" }, |
751 | 752 | { KEY_DC, CK_InputDeleteChar, "Delete" }, |
752 | | { ALT ('d'), CK_InputKillWord, "M-d" }, |
| 753 | { ALT ('D'), CK_Date, "M-D" }, |
| 754 | { ALT ('d'), CK_Date, "M-d" }, |
753 | 755 | { ALT (KEY_BACKSPACE), CK_InputBackwardKillWord, "M-BackSpace" }, |
| 756 | { ALT (KEY_DC), CK_InputKillWord, "M-Delete" }, |
754 | 757 | |
755 | 758 | /* Region manipulation */ |
756 | 759 | { XCTRL ('w'), CK_InputKillRegion, "C-w" }, |