diff --git a/edit/ChangeLog b/edit/ChangeLog index 68bfd0e78..d068280b7 100644 --- a/edit/ChangeLog +++ b/edit/ChangeLog @@ -1,3 +1,10 @@ +2001-11-14 Andrew V. Samoilov + + * edit_key_translator.c (cooledit_key_map): + Add C-k, CK_Delete_To_Line_End. + + * edit.c (user_menu): Don't assign block_file twice. + 2001-11-07 Andrew V. Samoilov * edit.c (edit_reload): destroy_dlg g_free()s widget(s), so diff --git a/edit/edit.c b/edit/edit.c index 41eae69ac..fdf6ecaf3 100644 --- a/edit/edit.c +++ b/edit/edit.c @@ -2682,8 +2682,7 @@ void user_menu (WEdit *edit) nomark = eval_marks (edit, &start_mark, &end_mark); if (! nomark) /* remember marked or not */ - edit_save_block (edit, block_file = catstrs (home_dir, BLOCK_FILE, 0), - start_mark, end_mark); + edit_save_block (edit, block_file, start_mark, end_mark); /* run shell scripts from menu */ user_menu_cmd (edit); diff --git a/edit/edit_key_translator.c b/edit/edit_key_translator.c index e14ff09e2..4244ca5b6 100644 --- a/edit/edit_key_translator.c +++ b/edit/edit_key_translator.c @@ -45,9 +45,12 @@ {OUR_BACKSPACE_KEY, CK_BackSpace, OUR_DELETE_KEY, CK_Delete, XCTRL ('d'), CK_Delete, '\n', CK_Enter, KEY_PPAGE, CK_Page_Up, KEY_NPAGE, CK_Page_Down, KEY_LEFT, CK_Left, - KEY_RIGHT, CK_Right, KEY_UP, CK_Up, KEY_DOWN, CK_Down, ALT ('\t'), CK_Return, ALT ('\n'), CK_Return, - KEY_HOME, CK_Home, KEY_END, CK_End, '\t', CK_Tab, XCTRL ('u'), CK_Undo, KEY_IC, CK_Toggle_Insert, - XCTRL ('o'), CK_Shell, KEY_F (3), CK_Mark, KEY_F (13), CK_Column_Mark, KEY_F (5), CK_Copy, + KEY_RIGHT, CK_Right, KEY_UP, CK_Up, KEY_DOWN, CK_Down, + ALT ('\t'), CK_Return, ALT ('\n'), CK_Return, + KEY_HOME, CK_Home, KEY_END, CK_End, '\t', CK_Tab, + XCTRL ('u'), CK_Undo, KEY_IC, CK_Toggle_Insert, + XCTRL ('o'), CK_Shell, KEY_F (3), CK_Mark, + KEY_F (13), CK_Column_Mark, KEY_F (5), CK_Copy, KEY_F (6), CK_Move, KEY_F (8), CK_Remove, KEY_F (12), CK_Save_As, KEY_F (2), CK_Save, XCTRL ('n'), CK_New, XCTRL ('l'), CK_Refresh, ESC_CHAR, CK_Exit, KEY_F (10), CK_Exit, @@ -59,7 +62,9 @@ ALT ('t'), CK_Sort, ALT ('m'), CK_Mail, XCTRL ('z'), CK_Word_Left, XCTRL ('x'), CK_Word_Right, KEY_F (4), CK_Replace, KEY_F (7), CK_Find, KEY_F (14), CK_Replace_Again, - XCTRL ('h'), CK_BackSpace, ALT ('l'), CK_Goto, ALT ('L'), CK_Goto, XCTRL ('y'), CK_Delete_Line, + XCTRL ('h'), CK_BackSpace, ALT ('l'), CK_Goto, ALT ('L'), CK_Goto, + XCTRL ('y'), CK_Delete_Line, + XCTRL ('k'), CK_Delete_To_Line_End, KEY_F (17), CK_Find_Again, ALT ('p'), CK_Paragraph_Format, ALT ('b'), CK_Match_Bracket, 0177, CK_BackSpace, @@ -68,9 +73,12 @@ static long const emacs_key_map[] = {OUR_BACKSPACE_KEY, CK_BackSpace, OUR_DELETE_KEY, CK_Delete, '\n', CK_Enter, KEY_PPAGE, CK_Page_Up, KEY_NPAGE, CK_Page_Down, KEY_LEFT, CK_Left, - KEY_RIGHT, CK_Right, KEY_UP, CK_Up, KEY_DOWN, CK_Down, ALT ('\t'), CK_Return, ALT ('\n'), CK_Return, - KEY_HOME, CK_Home, KEY_END, CK_End, '\t', CK_Tab, XCTRL ('u'), CK_Undo, KEY_IC, CK_Toggle_Insert, - XCTRL ('o'), CK_Shell, KEY_F (3), CK_Mark, KEY_F (13), CK_Column_Mark, KEY_F (5), CK_Copy, + KEY_RIGHT, CK_Right, KEY_UP, CK_Up, KEY_DOWN, CK_Down, + ALT ('\t'), CK_Return, ALT ('\n'), CK_Return, + KEY_HOME, CK_Home, KEY_END, CK_End, '\t', CK_Tab, + XCTRL ('u'), CK_Undo, KEY_IC, CK_Toggle_Insert, + XCTRL ('o'), CK_Shell, KEY_F (3), CK_Mark, KEY_F (13), CK_Column_Mark, + KEY_F (5), CK_Copy, KEY_F (6), CK_Move, KEY_F (8), CK_Remove, KEY_F (12), CK_Save_As, KEY_F (2), CK_Save, ALT ('p'), CK_Paragraph_Format,