From ed9e5d718308592a0628e992b2028cf9bdca75f1 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 3 Sep 2016 20:12:29 +0200
Subject: [PATCH] docs: mark some rebindable function names as deprecated
---
doc/man/nanorc.5 | 6 ++++++
doc/texinfo/nano.texi | 6 ++++++
src/global.c | 12 ++++++------
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index d2e47b1a..801f7f5b 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -413,6 +413,7 @@ a string in the current list in the file browser.
.TP
.B searchagain
Repeats the last search command without prompting.
+(The form 'research' is deprecated.)
.TP
.B findprevious
As \fBsearchagain\fR, but always in the backward direction.
@@ -447,6 +448,7 @@ Cuts all text from the cursor position till the end of the buffer.
.TP
.B curpos
Shows the current cursor position: the line, column, and character positions.
+(The form 'cursorpos' is deprecated.)
.TP
.B wordcount
Counts the number of words, lines and characters in the current buffer.
@@ -579,6 +581,7 @@ Toggles case sensitivity in searching (search/replace menus only).
.TP
.B regexp
Toggles whether searching/replacing is based on literal strings or regular expressions.
+(The form 'regex' is deprecated.)
.TP
.B backwards
Toggles whether searching/replacing goes forward or backward.
@@ -591,6 +594,7 @@ Shows the next history entry in the prompt menus (e.g. search).
.TP
.B flipreplace
Toggles between searching for something and replacing something.
+(The form 'dontreplace' is deprecated.)
.TP
.B flipexecute
Toggles between inserting a file and executing a command.
@@ -598,6 +602,7 @@ Toggles between inserting a file and executing a command.
.B flipnewbuffer
Toggles between inserting into the current buffer and into a new
empty buffer.
+(The form 'newbuffer' is deprecated.)
.TP
.B dosformat
When writing a file, switches to writing a DOS format (CR/LF).
@@ -701,6 +706,7 @@ The 'search to replace' menu.
.TP
.B replacewith
The 'replace with' menu, which comes up after 'search to replace'.
+(The form 'replace2' is deprecated.)
.TP
.B gotoline
The 'goto line (and column)' menu.
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 83fe46ca..b870fa3d 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -1008,6 +1008,7 @@ a string in the current list in the file browser
@item searchagain
Repeats the last search command without prompting.
+(The form 'research' is deprecated.)
@item findprevious
As @code{searchagain}, but always in the backward direction.
@@ -1042,6 +1043,7 @@ Cuts all text from the cursor position till the end of the buffer.
@item curpos
Shows the current cursor position: the line, column, and character positions.
+(The form 'cursorpos' is deprecated.)
@item wordcount
Counts the number of words, lines and characters in the current buffer.
@@ -1171,6 +1173,7 @@ Toggles case sensitivity in searching (search/replace menus only).
@item regexp
Toggles whether searching/replacing is based on literal strings or regular expressions.
+(The form 'regex' is deprecated.)
@item backwards
Toggles whether searching/replacing goes forward or backward.
@@ -1183,6 +1186,7 @@ Shows the next history entry in the prompt menus (e.g.@: search).
@item flipreplace
Toggles between searching for something and replacing something.
+(The form 'dontreplace' is deprecated.)
@item flipexecute
Toggles between inserting a file and executing a command.
@@ -1190,6 +1194,7 @@ Toggles between inserting a file and executing a command.
@item flipnewbuffer
Toggles between inserting into the current buffer and into a new
empty buffer.
+(The form 'newbuffer' is deprecated.)
@item dosformat
When writing a file, switches to writing a DOS format (CR/LF).
@@ -1294,6 +1299,7 @@ The 'search to replace' menu.
@item replacewith
The 'replace with' menu, which comes up after 'search to replace'.
+(The form 'replace2' is deprecated.)
@item gotoline
The 'goto line (and column)' menu.
diff --git a/src/global.c b/src/global.c
index 95bab980..84d239da 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1397,7 +1397,7 @@ sc *strtosc(const char *input)
s->scfunc = do_search;
#ifndef NANO_TINY
else if (!strcasecmp(input, "searchagain") ||
- !strcasecmp(input, "research"))
+ !strcasecmp(input, "research")) /* Deprecated. Remove in 2018. */
s->scfunc = do_research;
else if (!strcasecmp(input, "findprevious"))
s->scfunc = do_findprevious;
@@ -1428,7 +1428,7 @@ sc *strtosc(const char *input)
s->scfunc = do_linter;
#endif
else if (!strcasecmp(input, "curpos") ||
- !strcasecmp(input, "cursorpos"))
+ !strcasecmp(input, "cursorpos")) /* Deprecated. Remove in 2018. */
s->scfunc = do_cursorpos_void;
else if (!strcasecmp(input, "gotoline"))
s->scfunc = do_gotolinecolumn_void;
@@ -1527,14 +1527,14 @@ sc *strtosc(const char *input)
s->scfunc = case_sens_void;
#endif
else if (!strcasecmp(input, "regexp") ||
- !strcasecmp(input, "regex"))
+ !strcasecmp(input, "regex")) /* Deprecated. Remove in 2018. */
s->scfunc = regexp_void;
#ifndef NANO_TINY
else if (!strcasecmp(input, "backwards"))
s->scfunc = backwards_void;
#endif
else if (!strcasecmp(input, "flipreplace") ||
- !strcasecmp(input, "dontreplace"))
+ !strcasecmp(input, "dontreplace")) /* Deprecated. Remove in 2018. */
s->scfunc = flip_replace_void;
else if (!strcasecmp(input, "gototext"))
s->scfunc = gototext_void;
@@ -1560,7 +1560,7 @@ sc *strtosc(const char *input)
#endif
#ifndef DISABLE_MULTIBUFFER
else if (!strcasecmp(input, "flipnewbuffer") ||
- !strcasecmp(input, "newbuffer"))
+ !strcasecmp(input, "newbuffer")) /* Deprecated. Remove in 2018. */
s->scfunc = new_buffer_void;
#endif
#ifndef DISABLE_BROWSER
@@ -1640,7 +1640,7 @@ int strtomenu(const char *input)
return MWHEREIS;
else if (!strcasecmp(input, "replace"))
return MREPLACE;
- else if (!strcasecmp(input, "replace2") ||
+ else if (!strcasecmp(input, "replace2") || /* Deprecated. Remove in 2018. */
!strcasecmp(input, "replacewith"))
return MREPLACEWITH;
else if (!strcasecmp(input, "gotoline"))
--
GitLab