commit 54a4123d4c62e1258e9eccfd62b725b47afdd9e7
parent 7a315071672ce3b6aa0114c2100558f9456463b2
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Sat, 28 Jul 2018 11:15:41 +0200
bindings: remove the 'searchagain' function entirely
The user is obliged to make use of 'findprevious' and 'findnext' instead.
Also, adjust the description of 'wherewas' to its wider availability.
Diffstat:
3 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/doc/nano.texi b/doc/nano.texi
@@ -1120,16 +1120,14 @@ Starts a forward search for text in the current buffer --- or for filenames
matching a string in the current list in the file browser.
@item wherewas
-Starts a backward search for text in the current buffer.
-
-@item searchagain
-Repeats the last search command without prompting.
+Starts a backward search for text in the current buffer --- or for filenames
+matching a string in the current list in the file browser.
@item findprevious
-As @code{searchagain}, but always in the backward direction.
+Searches the next occurrence in the backward direction.
@item findnext
-As @code{searchagain}, but always in the forward direction.
+Searches the next occurrence in the forward direction.
@item replace
Interactively replaces text within the current buffer.
diff --git a/doc/nanorc.5 b/doc/nanorc.5
@@ -470,16 +470,14 @@ Starts a forward search for text in the current buffer -- or for filenames
matching a string in the current list in the file browser.
.TP
.B wherewas
-Starts a backward search for text in the current buffer.
-.TP
-.B searchagain
-Repeats the last search command without prompting.
+Starts a backward search for text in the current buffer -- or for filenames
+matching a string in the current list in the file browser.
.TP
.B findprevious
-As \fBsearchagain\fR, but always in the backward direction.
+Searches the next occurrence in the backward direction.
.TP
.B findnext
-As \fBsearchagain\fR, but always in the forward direction.
+Searches the next occurrence in the forward direction.
.TP
.B replace
Interactively replaces text within the current buffer.
diff --git a/src/global.c b/src/global.c
@@ -515,8 +515,6 @@ void shortcut_init(void)
const char *fulljustify_tag = N_("FullJstify");
#endif
const char *refresh_tag = N_("Refresh");
- /* TRANSLATORS: Try to keep this string at most 12 characters. */
- const char *whereisnext_tag = N_("WhereIs Next");
#ifdef ENABLE_HELP
/* TRANSLATORS: The next long series of strings are shortcut descriptions;
@@ -556,7 +554,6 @@ void shortcut_init(void)
#endif
const char *replace_gist = N_("Replace a string or a regular expression");
const char *gotoline_gist = N_("Go to line and column number");
- const char *whereisnext_gist = N_("Repeat the last search");
#ifndef NANO_TINY
const char *mark_gist = N_("Mark text starting from the cursor position");
const char *copy_gist =
@@ -982,9 +979,6 @@ void shortcut_init(void)
add_to_funcs(run_macro, MMAIN,
N_("Run Macro"), WITHORSANS(runmacro_gist), BLANKAFTER, VIEW);
- add_to_funcs(do_research, MMAIN,
- whereisnext_tag, WITHORSANS(whereisnext_gist), BLANKAFTER, VIEW);
-
add_to_funcs(do_savefile, MMAIN,
N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW);
#endif
@@ -1143,7 +1137,6 @@ void shortcut_init(void)
add_to_sclist(MMAIN|MHELP, "M-?", 0, to_last_line, 0);
add_to_sclist(MMAIN|MHELP|MBROWSER, "M-W", 0, do_findnext, 0);
add_to_sclist(MMAIN|MHELP|MBROWSER, "M-Q", 0, do_findprevious, 0);
- add_to_sclist(MMAIN, "F16", 0, do_research, 0);
#ifndef NANO_TINY
add_to_sclist(MMAIN, "M-]", 0, do_find_bracket, 0);
add_to_sclist(MMAIN, "M-A", 0, do_mark, 0);
@@ -1487,8 +1480,6 @@ sc *strtosc(const char *input)
s->func = do_search_forward;
else if (!strcasecmp(input, "wherewas"))
s->func = do_search_backward;
- else if (!strcasecmp(input, "searchagain"))
- s->func = do_research;
else if (!strcasecmp(input, "findprevious"))
s->func = do_findprevious;
else if (!strcasecmp(input, "findnext"))
