From 6f1205aed94b76ef211db79b671ae9feab5de2ee Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 16 Feb 2023 17:06:17 +0100 Subject: [PATCH] bindings: let ^F by default start a forward search This makes nano more usable for users that are accustomed to the near universal use of ^F for Find/Search in other programs. To keep the bindings consistent, let ^B start a backward search, and let M-F and M-B search for the next occurrence in that direction. --- src/global.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/global.c b/src/global.c index ed93fa31..0b729697 100644 --- a/src/global.c +++ b/src/global.c @@ -1178,6 +1178,8 @@ void shortcut_init(void) add_to_sclist(MMAIN, "^O", 0, do_writeout, 0); add_to_sclist(MMAIN, "^R", 0, do_insertfile, 0); add_to_sclist(MMAIN, "Ins", KEY_IC, do_insertfile, 0); + add_to_sclist(MMAIN|MBROWSER|MHELP, "^B", 0, do_search_backward, 0); + add_to_sclist(MMAIN|MBROWSER|MHELP, "^F", 0, do_search_forward, 0); if (!ISSET(PRESERVE)) add_to_sclist(MMAIN|MBROWSER|MHELP, "^Q", 0, do_search_backward, 0); add_to_sclist(MMAIN|MBROWSER|MHELP, "^W", 0, do_search_forward, 0); @@ -1202,11 +1204,9 @@ void shortcut_init(void) add_to_sclist(MMAIN, "^J", '\n', do_justify, 0); #endif #ifdef ENABLE_LINTER - add_to_sclist(MMAIN, "M-B", 0, do_linter, 0); add_to_sclist(MEXECUTE, "^Y", 0, do_linter, 0); #endif #ifdef ENABLE_FORMATTER - add_to_sclist(MMAIN, "M-F", 0, do_formatter, 0); add_to_sclist(MEXECUTE, "^O", 0, do_formatter, 0); #endif add_to_sclist(MMAIN, "^C", 0, report_cursor_position, 0); @@ -1224,17 +1224,17 @@ void shortcut_init(void) add_to_sclist(MMAIN|MHELP, "^Home", CONTROL_HOME, to_first_line, 0); add_to_sclist(MMAIN|MHELP, "M-/", 0, to_last_line, 0); add_to_sclist(MMAIN|MHELP, "^End", CONTROL_END, to_last_line, 0); + add_to_sclist(MMAIN|MBROWSER|MHELP, "M-B", 0, do_findprevious, 0); + add_to_sclist(MMAIN|MBROWSER|MHELP, "M-F", 0, do_findnext, 0); add_to_sclist(MMAIN|MBROWSER|MHELP, "M-W", 0, do_findnext, 0); add_to_sclist(MMAIN|MBROWSER|MHELP, "M-Q", 0, do_findprevious, 0); #ifdef NANO_TINY #ifdef ENABLE_LINENUMBERS add_to_sclist(MMAIN, "M-N", 0, toggle_numbers, 0); #else - add_to_sclist(MMAIN, "M-B", 0, to_prev_word, 0); add_to_sclist(MMAIN, "M-N", 0, to_next_word, 0); #endif add_to_sclist(MMAIN, "M-D", 0, to_prev_word, 0); - add_to_sclist(MMAIN, "M-F", 0, to_next_word, 0); #else add_to_sclist(MMAIN, "M-]", 0, do_find_bracket, 0); add_to_sclist(MMAIN, "M-A", 0, do_mark, 0); @@ -1264,8 +1264,8 @@ void shortcut_init(void) #ifdef ENABLE_COMMENT add_to_sclist(MMAIN, "M-3", 0, do_comment, 0); #endif - add_to_sclist(MMOST|MBROWSER, "^B", 0, do_left, 0); - add_to_sclist(MMOST|MBROWSER, "^F", 0, do_right, 0); + add_to_sclist(MMOST & ~MMAIN, "^B", 0, do_left, 0); + add_to_sclist(MMOST & ~MMAIN, "^F", 0, do_right, 0); #ifdef ENABLE_UTF8 if (using_utf8()) { add_to_sclist(MMOST|MBROWSER|MHELP, "\xE2\x97\x82", KEY_LEFT, do_left, 0); -- 2.37.5