ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
master
Benno Schulenberg 2018-07-28 11:15:41 +02:00
parent 7a31507167
commit 54a4123d4c
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/nano.texi
View File

@ -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. matching a string in the current list in the file browser.
@item wherewas @item wherewas
Starts a backward search for text in the current buffer. 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 searchagain
Repeats the last search command without prompting.
@item findprevious @item findprevious
As @code{searchagain}, but always in the backward direction. Searches the next occurrence in the backward direction.
@item findnext @item findnext
As @code{searchagain}, but always in the forward direction. Searches the next occurrence in the forward direction.
@item replace @item replace
Interactively replaces text within the current buffer. Interactively replaces text within the current buffer.

10
doc/nanorc.5
View File

@ -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. matching a string in the current list in the file browser.
.TP .TP
.B wherewas .B wherewas
Starts a backward search for text in the current buffer. Starts a backward search for text in the current buffer -- or for filenames
.TP matching a string in the current list in the file browser.
.B searchagain
Repeats the last search command without prompting.
.TP .TP
.B findprevious .B findprevious
As \fBsearchagain\fR, but always in the backward direction. Searches the next occurrence in the backward direction.
.TP .TP
.B findnext .B findnext
As \fBsearchagain\fR, but always in the forward direction. Searches the next occurrence in the forward direction.
.TP .TP
.B replace .B replace
Interactively replaces text within the current buffer. Interactively replaces text within the current buffer.

9
src/global.c
View File

@ -515,8 +515,6 @@ void shortcut_init(void)
const char *fulljustify_tag = N_("FullJstify"); const char *fulljustify_tag = N_("FullJstify");
#endif #endif
const char *refresh_tag = N_("Refresh"); 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 #ifdef ENABLE_HELP
/* TRANSLATORS: The next long series of strings are shortcut descriptions; /* TRANSLATORS: The next long series of strings are shortcut descriptions;
@ -556,7 +554,6 @@ void shortcut_init(void)
#endif #endif
const char *replace_gist = N_("Replace a string or a regular expression"); 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 *gotoline_gist = N_("Go to line and column number");
const char *whereisnext_gist = N_("Repeat the last search");
#ifndef NANO_TINY #ifndef NANO_TINY
const char *mark_gist = N_("Mark text starting from the cursor position"); const char *mark_gist = N_("Mark text starting from the cursor position");
const char *copy_gist = const char *copy_gist =
@ -982,9 +979,6 @@ void shortcut_init(void)
add_to_funcs(run_macro, MMAIN, add_to_funcs(run_macro, MMAIN,
N_("Run Macro"), WITHORSANS(runmacro_gist), BLANKAFTER, VIEW); 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, add_to_funcs(do_savefile, MMAIN,
N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW); N_("Save"), WITHORSANS(savefile_gist), BLANKAFTER, NOVIEW);
#endif #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, "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-W", 0, do_findnext, 0);
add_to_sclist(MMAIN|MHELP|MBROWSER, "M-Q", 0, do_findprevious, 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 #ifndef NANO_TINY
add_to_sclist(MMAIN, "M-]", 0, do_find_bracket, 0); add_to_sclist(MMAIN, "M-]", 0, do_find_bracket, 0);
add_to_sclist(MMAIN, "M-A", 0, do_mark, 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; s->func = do_search_forward;
else if (!strcasecmp(input, "wherewas")) else if (!strcasecmp(input, "wherewas"))
s->func = do_search_backward; s->func = do_search_backward;
else if (!strcasecmp(input, "searchagain"))
s->func = do_research;
else if (!strcasecmp(input, "findprevious")) else if (!strcasecmp(input, "findprevious"))
s->func = do_findprevious; s->func = do_findprevious;
else if (!strcasecmp(input, "findnext")) else if (!strcasecmp(input, "findnext"))