mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-26 14:51:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

bindings: rename 'prevhistory' to 'older' and 'nexthistory' to 'newer'

Browse Source 
Rename not only the bindable functions, but more importantly reword the
tags that are shown for ^P and ^N in the help lines: "Older" / "Newer",
because these are clearer and not awkward abbreviations.
This commit is contained in:
Benno Schulenberg 2018-10-08 19:27:56 +02:00
parent 33d67d5cee
commit f442f91187
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/nano.texi
View File

@ -1312,11 +1312,11 @@ Toggles whether searching/replacing uses literal strings or regular expressions.
@item backwards
Toggles whether searching/replacing goes forward or backward.
@item prevhistory
Retrieves the previous (older) entry at a prompt.
@item older
Retrieves the previous (earlier) entry at a prompt.
@item nexthistory
Retrieves the next (newer) entry at a prompt.
@item newer
Retrieves the next (later) entry at a prompt.
@item flipreplace
Toggles between searching for something and replacing something.

8
doc/nanorc.5
View File

@ -673,11 +673,11 @@ Toggles whether searching/replacing uses literal strings or regular expressions.
.B backwards
Toggles whether searching/replacing goes forward or backward.
.TP
.B prevhistory
Retrieves the previous (older) entry at a prompt.
.B older
Retrieves the previous (earlier) entry at a prompt.
.TP
.B nexthistory
Retrieves the next (newer) entry at a prompt.
.B newer
Retrieves the next (later) entry at a prompt.
.TP
.B flipreplace
Toggles between searching for something and replacing something.

12
src/global.c
View File

@ -657,9 +657,9 @@ void shortcut_init(void)
const char *regexp_gist =
N_("Toggle the use of regular expressions");
#ifdef ENABLE_HISTORIES
const char *prevhistory_gist =
const char *older_gist =
N_("Recall the previous search/replace string");
const char *nexthistory_gist =
const char *newer_gist =
N_("Recall the next search/replace string");
#endif
#ifndef NANO_TINY
@ -990,9 +990,9 @@ void shortcut_init(void)
#endif
#ifdef ENABLE_HISTORIES
add_to_funcs(get_history_older_void, MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE,
N_("PrevHstory"), WITHORSANS(prevhistory_gist), TOGETHER, VIEW);
N_("Older"), WITHORSANS(older_gist), TOGETHER, VIEW);
add_to_funcs(get_history_newer_void, MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE,
N_("NextHstory"), WITHORSANS(nexthistory_gist), BLANKAFTER, VIEW);
N_("Newer"), WITHORSANS(newer_gist), BLANKAFTER, VIEW);
#endif
#ifndef ENABLE_JUSTIFY
@ -1605,9 +1605,9 @@ sc *strtosc(const char *input)
!strcasecmp(input, "gototext")) /* Deprecated. Remove end of 2018. */
s->func = flip_goto;
#ifdef ENABLE_HISTORIES
else if (!strcasecmp(input, "prevhistory"))
else if (!strcasecmp(input, "older"))
s->func = get_history_older_void;
else if (!strcasecmp(input, "nexthistory"))
else if (!strcasecmp(input, "newer"))
s->func = get_history_newer_void;
#endif
#ifndef NANO_TINY