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

tweaks: remove two deprecated options and six rebindable function names 

This addresses https://savannah.gnu.org/bugs/?48992.
master
Benno Schulenberg 2018-02-04 13:51:13 +01:00
parent 6d111c9343
commit 467cc8edf3
6 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/nano.1
View File

@ -121,7 +121,6 @@ Use the blank line below the title bar as extra editing space.
.BR \-P ", " \-\-positionlog .BR \-P ", " \-\-positionlog
For the 200 most recent files, log the last position of the cursor, For the 200 most recent files, log the last position of the cursor,
and place it at that position again upon reopening such a file. and place it at that position again upon reopening such a file.
(The old form of this option, \fB\-\-poslog\fR, is deprecated.)
.TP .TP
.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters """ .BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters """
Set the quoting string for justifying. The default is Set the quoting string for justifying. The default is

9
doc/nano.texi
View File

@ -217,7 +217,6 @@ Use the blank line below the title bar as extra editing space.
@itemx --positionlog @itemx --positionlog
For the 200 most recent files, log the last position of the cursor, For the 200 most recent files, log the last position of the cursor,
and place it at that position again upon reopening such a file. and place it at that position again upon reopening such a file.
(The old form of this option, @option{--poslog}, is deprecated.)
@item -Q "@var{characters}" @item -Q "@var{characters}"
@itemx --quotestr="@var{characters}" @itemx --quotestr="@var{characters}"
@ -731,7 +730,6 @@ Do case-sensitive searches by default.
@item set constantshow @item set constantshow
Constantly display the cursor position on the status bar. Constantly display the cursor position on the status bar.
(The old form of this option, @code{set const}, is deprecated.)
Note that this overrides @option{quickblank}. Note that this overrides @option{quickblank}.
@item set cutfromcursor @item set cutfromcursor
@ -815,7 +813,6 @@ directory feature is turned off.
@item set positionlog @item set positionlog
Save the cursor position of files between editing sessions. Save the cursor position of files between editing sessions.
The cursor position is remembered for the 200 most-recently edited files. The cursor position is remembered for the 200 most-recently edited files.
(The old form of this option, @code{set poslog}, is deprecated.)
@item set preserve @item set preserve
Preserve the XON and XOFF keys (@kbd{^Q} and @kbd{^S}). Preserve the XON and XOFF keys (@kbd{^Q} and @kbd{^S}).
@ -1102,7 +1099,6 @@ Starts a backward search for text in the current buffer.
@item searchagain @item searchagain
Repeats the last search command without prompting. Repeats the last search command without prompting.
(The form @code{research} is deprecated.)
@item findprevious @item findprevious
As @code{searchagain}, but always in the backward direction. As @code{searchagain}, but always in the backward direction.
@ -1137,7 +1133,6 @@ Cuts all text from the cursor position till the end of the buffer.
@item curpos @item curpos
Shows the current cursor position: the line, column, and character positions. Shows the current cursor position: the line, column, and character positions.
(The form @code{cursorpos} is deprecated.)
@item wordcount @item wordcount
Counts the number of words, lines and characters in the current buffer. Counts the number of words, lines and characters in the current buffer.
@ -1275,7 +1270,6 @@ Toggles case sensitivity in searching (search/replace menus only).
@item regexp @item regexp
Toggles whether searching/replacing is based on literal strings or regular expressions. Toggles whether searching/replacing is based on literal strings or regular expressions.
(The form @code{regex} is deprecated.)
@item backwards @item backwards
Toggles whether searching/replacing goes forward or backward. Toggles whether searching/replacing goes forward or backward.
@ -1288,7 +1282,6 @@ Shows the next history entry in the prompt menus (e.g.@: search).
@item flipreplace @item flipreplace
Toggles between searching for something and replacing something. Toggles between searching for something and replacing something.
(The form @code{dontreplace} is deprecated.)
@item flipgoto @item flipgoto
Toggles between searching for text and targeting a line number. Toggles between searching for text and targeting a line number.
@ -1300,7 +1293,6 @@ Toggles between inserting a file and executing a command.
@item flipnewbuffer @item flipnewbuffer
Toggles between inserting into the current buffer and into a new Toggles between inserting into the current buffer and into a new
empty buffer. empty buffer.
(The form @code{newbuffer} is deprecated.)
@item dosformat @item dosformat
When writing a file, switches to writing a DOS format (CR/LF). When writing a file, switches to writing a DOS format (CR/LF).
@ -1406,7 +1398,6 @@ The 'search to replace' menu.
@item replacewith @item replacewith
The 'replace with' menu, which comes up after 'search to replace'. The 'replace with' menu, which comes up after 'search to replace'.
(The form @code{replace2} is deprecated.)
@item gotoline @item gotoline
The 'goto line (and column)' menu. The 'goto line (and column)' menu.

8
doc/nanorc.5
View File

@ -96,7 +96,6 @@ Do case-sensitive searches by default.
.TP .TP
.B set constantshow .B set constantshow
Constantly display the cursor position in the status bar. Constantly display the cursor position in the status bar.
(The old form of this option, '\fBset const\fR', is deprecated.)
This overrides the option \fBquickblank\fR. This overrides the option \fBquickblank\fR.
.TP .TP
.B set cutfromcursor .B set cutfromcursor
@ -178,7 +177,6 @@ directory feature is turned off.
.B set positionlog .B set positionlog
Save the cursor position of files between editing sessions. Save the cursor position of files between editing sessions.
The cursor position is remembered for the 200 most-recently edited files. The cursor position is remembered for the 200 most-recently edited files.
(The old form of this option, '\fBset poslog\fR', is deprecated.)
.TP .TP
.B set preserve .B set preserve
Preserve the XON and XOFF keys (^Q and ^S). Preserve the XON and XOFF keys (^Q and ^S).
@ -453,7 +451,6 @@ Starts a backward search for text in the current buffer.
.TP .TP
.B searchagain .B searchagain
Repeats the last search command without prompting. Repeats the last search command without prompting.
(The form 'research' is deprecated.)
.TP .TP
.B findprevious .B findprevious
As \fBsearchagain\fR, but always in the backward direction. As \fBsearchagain\fR, but always in the backward direction.
@ -488,7 +485,6 @@ Cuts all text from the cursor position till the end of the buffer.
.TP .TP
.B curpos .B curpos
Shows the current cursor position: the line, column, and character positions. Shows the current cursor position: the line, column, and character positions.
(The form 'cursorpos' is deprecated.)
.TP .TP
.B wordcount .B wordcount
Counts the number of words, lines and characters in the current buffer. Counts the number of words, lines and characters in the current buffer.
@ -629,7 +625,6 @@ Toggles case sensitivity in searching (search/replace menus only).
.TP .TP
.B regexp .B regexp
Toggles whether searching/replacing is based on literal strings or regular expressions. Toggles whether searching/replacing is based on literal strings or regular expressions.
(The form 'regex' is deprecated.)
.TP .TP
.B backwards .B backwards
Toggles whether searching/replacing goes forward or backward. Toggles whether searching/replacing goes forward or backward.
@ -642,7 +637,6 @@ Shows the next history entry in the prompt menus (e.g. search).
.TP .TP
.B flipreplace .B flipreplace
Toggles between searching for something and replacing something. Toggles between searching for something and replacing something.
(The form 'dontreplace' is deprecated.)
.TP .TP
.B flipgoto .B flipgoto
Toggles between searching for text and targeting a line number. Toggles between searching for text and targeting a line number.
@ -654,7 +648,6 @@ Toggles between inserting a file and executing a command.
.B flipnewbuffer .B flipnewbuffer
Toggles between inserting into the current buffer and into a new Toggles between inserting into the current buffer and into a new
empty buffer. empty buffer.
(The form 'newbuffer' is deprecated.)
.TP .TP
.B dosformat .B dosformat
When writing a file, switches to writing a DOS format (CR/LF). When writing a file, switches to writing a DOS format (CR/LF).
@ -758,7 +751,6 @@ The 'search to replace' menu.
.TP .TP
.B replacewith .B replacewith
The 'replace with' menu, which comes up after 'search to replace'. The 'replace with' menu, which comes up after 'search to replace'.
(The form 'replace2' is deprecated.)
.TP .TP
.B gotoline .B gotoline
The 'goto line (and column)' menu. The 'goto line (and column)' menu.

18
src/global.c
View File

@ -1485,8 +1485,7 @@ sc *strtosc(const char *input)
s->scfunc = do_search_forward; s->scfunc = do_search_forward;
else if (!strcasecmp(input, "wherewas")) else if (!strcasecmp(input, "wherewas"))
s->scfunc = do_search_backward; s->scfunc = do_search_backward;
else if (!strcasecmp(input, "searchagain") || else if (!strcasecmp(input, "searchagain"))
!strcasecmp(input, "research")) /* Deprecated. Remove in 2018. */
s->scfunc = do_research; s->scfunc = do_research;
#ifndef NANO_TINY #ifndef NANO_TINY
else if (!strcasecmp(input, "findprevious")) else if (!strcasecmp(input, "findprevious"))
@ -1517,8 +1516,7 @@ sc *strtosc(const char *input)
else if (!strcasecmp(input, "linter")) else if (!strcasecmp(input, "linter"))
s->scfunc = do_linter; s->scfunc = do_linter;
#endif #endif
else if (!strcasecmp(input, "curpos") || else if (!strcasecmp(input, "curpos"))
!strcasecmp(input, "cursorpos")) /* Deprecated. Remove in 2018. */
s->scfunc = do_cursorpos_void; s->scfunc = do_cursorpos_void;
else if (!strcasecmp(input, "gotoline")) else if (!strcasecmp(input, "gotoline"))
s->scfunc = do_gotolinecolumn_void; s->scfunc = do_gotolinecolumn_void;
@ -1622,13 +1620,11 @@ sc *strtosc(const char *input)
s->scfunc = do_suspend_void; s->scfunc = do_suspend_void;
else if (!strcasecmp(input, "casesens")) else if (!strcasecmp(input, "casesens"))
s->scfunc = case_sens_void; s->scfunc = case_sens_void;
else if (!strcasecmp(input, "regexp") || else if (!strcasecmp(input, "regexp"))
!strcasecmp(input, "regex")) /* Deprecated. Remove in 2018. */
s->scfunc = regexp_void; s->scfunc = regexp_void;
else if (!strcasecmp(input, "backwards")) else if (!strcasecmp(input, "backwards"))
s->scfunc = backwards_void; s->scfunc = backwards_void;
else if (!strcasecmp(input, "flipreplace") || else if (!strcasecmp(input, "flipreplace"))
!strcasecmp(input, "dontreplace")) /* Deprecated. Remove in 2018. */
s->scfunc = flip_replace; s->scfunc = flip_replace;
else if (!strcasecmp(input, "flipgoto") || else if (!strcasecmp(input, "flipgoto") ||
!strcasecmp(input, "gototext")) /* Deprecated. Remove end of 2018. */ !strcasecmp(input, "gototext")) /* Deprecated. Remove end of 2018. */
@ -1654,8 +1650,7 @@ sc *strtosc(const char *input)
s->scfunc = flip_execute; s->scfunc = flip_execute;
#endif #endif
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
else if (!strcasecmp(input, "flipnewbuffer") || else if (!strcasecmp(input, "flipnewbuffer"))
!strcasecmp(input, "newbuffer")) /* Deprecated. Remove in 2018. */
s->scfunc = flip_newbuffer; s->scfunc = flip_newbuffer;
#endif #endif
#ifdef ENABLE_BROWSER #ifdef ENABLE_BROWSER
@ -1735,8 +1730,7 @@ int strtomenu(const char *input)
return MWHEREIS; return MWHEREIS;
else if (!strcasecmp(input, "replace")) else if (!strcasecmp(input, "replace"))
return MREPLACE; return MREPLACE;
else if (!strcasecmp(input, "replace2") || /* Deprecated. Remove in 2018. */ else if (!strcasecmp(input, "replacewith2"))
!strcasecmp(input, "replacewith"))
return MREPLACEWITH; return MREPLACEWITH;
else if (!strcasecmp(input, "gotoline")) else if (!strcasecmp(input, "gotoline"))
return MGOTOLINE; return MGOTOLINE;

1
src/nano.c
View File

@ -1974,7 +1974,6 @@ int main(int argc, char **argv)
{"locking", 0, NULL, 'G'}, {"locking", 0, NULL, 'G'},
{"historylog", 0, NULL, 'H'}, {"historylog", 0, NULL, 'H'},
{"noconvert", 0, NULL, 'N'}, {"noconvert", 0, NULL, 'N'},
{"poslog", 0, NULL, 'P'}, /* deprecated form, remove in 2018 */
{"positionlog", 0, NULL, 'P'}, {"positionlog", 0, NULL, 'P'},
{"smooth", 0, NULL, 'S'}, {"smooth", 0, NULL, 'S'},
{"wordbounds", 0, NULL, 'W'}, {"wordbounds", 0, NULL, 'W'},

2
src/rcfile.c
View File

@ -42,7 +42,6 @@ static const rcoption rcopts[] = {
#ifdef ENABLE_JUSTIFY #ifdef ENABLE_JUSTIFY
{"brackets", 0}, {"brackets", 0},
#endif #endif
{"const", CONSTANT_SHOW}, /* deprecated form, remove in 2018 */
{"constantshow", CONSTANT_SHOW}, {"constantshow", CONSTANT_SHOW},
#ifdef ENABLED_WRAPORJUSTIFY #ifdef ENABLED_WRAPORJUSTIFY
{"fill", 0}, {"fill", 0},
@ -67,7 +66,6 @@ static const rcoption rcopts[] = {
{"operatingdir", 0}, {"operatingdir", 0},
#endif #endif
#ifdef ENABLE_HISTORIES #ifdef ENABLE_HISTORIES
{"poslog", POS_HISTORY}, /* deprecated form, remove in 2018 */
{"positionlog", POS_HISTORY}, {"positionlog", POS_HISTORY},
#endif #endif
{"preserve", PRESERVE}, {"preserve", PRESERVE},