rcfile, docs: remove deprecated forms of two options and five bindables
This addresses https://savannah.gnu.org/bugs/?53785.master
Benno Schulenberg
parent
0f79a42333
commit
3a79766da6
|
|
@ -733,7 +733,6 @@ Note that this overrides @option{quickblank}.
|
|||
|
||||
@item set cutfromcursor
|
||||
Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line.
|
||||
(The old form of this option, @code{set cut}, is deprecated.)
|
||||
|
||||
@item set errorcolor @var{fgcolor},@var{bgcolor}
|
||||
Use this color combination for the status bar when an error message is displayed.
|
||||
|
|
@ -904,7 +903,6 @@ Use this color combination for the title bar.
|
|||
@item set trimblanks
|
||||
Remove trailing whitespace from wrapped lines when automatic
|
||||
hard-wrapping occurs or when text is justified.
|
||||
(The old form of this option, @code{set justifytrim}, is deprecated.)
|
||||
|
||||
@item set unix
|
||||
Save a file by default in Unix format. This overrides nano's
|
||||
|
|
@ -1146,12 +1144,10 @@ Cuts and stores the current line (or the marked region).
|
|||
|
||||
@item copy
|
||||
Copies the current line (or the marked region) without deleting it.
|
||||
(The old form 'copytext' is deprecated.)
|
||||
|
||||
@item paste
|
||||
Pastes the currently stored text into the current buffer at the
|
||||
current cursor position.
|
||||
(The old form 'uncut' is deprecated.)
|
||||
|
||||
@item zap
|
||||
Throw away the current line (or the marked region).
|
||||
|
|
@ -1334,7 +1330,6 @@ Toggles between searching for something and replacing something.
|
|||
|
||||
@item flipgoto
|
||||
Toggles between searching for text and targeting a line number.
|
||||
(The form @code{gototext} is deprecated.)
|
||||
|
||||
@item flipexecute
|
||||
Toggles between inserting a file and executing a command.
|
||||
|
|
@ -1389,7 +1384,6 @@ Toggles the presence of the two-line list of key bindings at the bottom of the s
|
|||
|
||||
@item constantshow
|
||||
Toggles the constant display of the current line, column, and character positions.
|
||||
(The form @code{constupdate} is deprecated.)
|
||||
|
||||
@item smoothscroll
|
||||
Toggles smooth scrolling (when moving around with the arrow keys).
|
||||
|
|
@ -1417,7 +1411,6 @@ is the beginning of a paragraph.
|
|||
@item cutfromcursor
|
||||
Toggles whether cutting text will cut the whole line or just from the current cursor
|
||||
position to the end of the line.
|
||||
(The form @code{cuttoend} is deprecated.)
|
||||
|
||||
@item nowrap
|
||||
Toggles whether long lines will be hard-wrapped to the next line.
|
||||
|
|
|
|||
|
|
@ -101,7 +101,6 @@ This overrides the option \fBquickblank\fR.
|
|||
.TP
|
||||
.B set cutfromcursor
|
||||
Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line.
|
||||
(The old form of this option, '\fBset cut\fR', is deprecated.)
|
||||
.TP
|
||||
.B set errorcolor \fIfgcolor\fR,\fIbgcolor\fR
|
||||
Use this color combination for the status bar when an error message is displayed.
|
||||
|
|
@ -272,7 +271,6 @@ And either "\fIfgcolor\fR" or ",\fIbgcolor\fR" may be left out.
|
|||
.B set trimblanks
|
||||
Remove trailing whitespace from wrapped lines when automatic
|
||||
hard-wrapping occurs or when text is justified.
|
||||
(The old form of this option, '\fBset justifytrim\fR', is deprecated.)
|
||||
.TP
|
||||
.B set unix
|
||||
Save a file by default in Unix format. This overrides nano's
|
||||
|
|
@ -503,12 +501,10 @@ Cuts and stores the current line (or the marked region).
|
|||
.TP
|
||||
.B copy
|
||||
Copies the current line (or the marked region) without deleting it.
|
||||
(The old form 'copytext' is deprecated.)
|
||||
.TP
|
||||
.B paste
|
||||
Pastes the currently stored text into the current buffer at the
|
||||
current cursor position.
|
||||
(The old form 'uncut' is deprecated.)
|
||||
.TP
|
||||
.B zap
|
||||
Throw away the current line (or the marked region).
|
||||
|
|
@ -694,7 +690,6 @@ Toggles between searching for something and replacing something.
|
|||
.TP
|
||||
.B flipgoto
|
||||
Toggles between searching for text and targeting a line number.
|
||||
(The form 'gototext' is deprecated.)
|
||||
.TP
|
||||
.B flipexecute
|
||||
Toggles between inserting a file and executing a command.
|
||||
|
|
@ -749,7 +744,6 @@ Toggles the presence of the two-line list of key bindings at the bottom of the s
|
|||
.TP
|
||||
.B constantshow
|
||||
Toggles the constant display of the current line, column, and character positions.
|
||||
(The form 'constupdate' is deprecated.)
|
||||
.TP
|
||||
.B smoothscroll
|
||||
Toggles smooth scrolling (when moving around with the arrow keys).
|
||||
|
|
@ -777,7 +771,6 @@ is the beginning of a paragraph.
|
|||
.B cutfromcursor
|
||||
Toggles whether cutting text will cut the whole line or just from the current cursor
|
||||
position to the end of the line.
|
||||
(The form 'cuttoend' is deprecated.)
|
||||
.TP
|
||||
.B nowrap
|
||||
Toggles whether long lines will be hard-wrapped to the next line.
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@
|
|||
|
||||
## Use cut-from-cursor-to-end-of-line by default.
|
||||
# set cutfromcursor
|
||||
## (The old form, 'cut', is deprecated.)
|
||||
|
||||
## Enable hard-wrapping and set the target width, both for automatic
|
||||
## line wrapping and for justifying paragraphs. If the value is 0 or
|
||||
|
|
@ -172,7 +171,6 @@
|
|||
|
||||
## Snip whitespace at the end of lines when justifying or hard-wrapping.
|
||||
# set trimblanks
|
||||
## (The old form, 'justifytrim', is deprecated.)
|
||||
|
||||
## Disallow file modification. Why would you want this in an rcfile? ;)
|
||||
# set view
|
||||
|
|
|
|||
15
src/global.c
15
src/global.c
|
|
@ -1465,14 +1465,12 @@ sc *strtosc(const char *input)
|
|||
s->func = do_replace;
|
||||
else if (!strcasecmp(input, "cut"))
|
||||
s->func = do_cut_text_void;
|
||||
else if (!strcasecmp(input, "paste") ||
|
||||
!strcasecmp(input, "uncut")) /* Deprecated. Remove end of 2018. */
|
||||
else if (!strcasecmp(input, "paste"))
|
||||
s->func = do_uncut_text;
|
||||
#ifndef NANO_TINY
|
||||
else if (!strcasecmp(input, "cutrestoffile"))
|
||||
s->func = do_cut_till_eof;
|
||||
else if (!strcasecmp(input, "copy") ||
|
||||
!strcasecmp(input, "copytext")) /* Deprecated. Remove end of 2018. */
|
||||
else if (!strcasecmp(input, "copy"))
|
||||
s->func = do_copy_text;
|
||||
else if (!strcasecmp(input, "zap"))
|
||||
s->func = zap_text;
|
||||
|
|
@ -1600,8 +1598,7 @@ sc *strtosc(const char *input)
|
|||
s->func = backwards_void;
|
||||
else if (!strcasecmp(input, "flipreplace"))
|
||||
s->func = flip_replace;
|
||||
else if (!strcasecmp(input, "flipgoto") ||
|
||||
!strcasecmp(input, "gototext")) /* Deprecated. Remove end of 2018. */
|
||||
else if (!strcasecmp(input, "flipgoto"))
|
||||
s->func = flip_goto;
|
||||
#ifdef ENABLE_HISTORIES
|
||||
else if (!strcasecmp(input, "older"))
|
||||
|
|
@ -1647,8 +1644,7 @@ sc *strtosc(const char *input)
|
|||
s->func = do_toggle_void;
|
||||
if (!strcasecmp(input, "nohelp"))
|
||||
s->toggle = NO_HELP;
|
||||
else if (!strcasecmp(input, "constantshow") ||
|
||||
!strcasecmp(input, "constupdate")) /* Deprecated. Remove end of 2018. */
|
||||
else if (!strcasecmp(input, "constantshow"))
|
||||
s->toggle = CONSTANT_SHOW;
|
||||
else if (!strcasecmp(input, "smoothscroll"))
|
||||
s->toggle = SMOOTH_SCROLL;
|
||||
|
|
@ -1668,8 +1664,7 @@ sc *strtosc(const char *input)
|
|||
s->toggle = SMART_HOME;
|
||||
else if (!strcasecmp(input, "autoindent"))
|
||||
s->toggle = AUTOINDENT;
|
||||
else if (!strcasecmp(input, "cutfromcursor") ||
|
||||
!strcasecmp(input, "cuttoend")) /* Deprecated. Remove end of 2018. */
|
||||
else if (!strcasecmp(input, "cutfromcursor"))
|
||||
s->toggle = CUT_FROM_CURSOR;
|
||||
#ifdef ENABLE_WRAPPING
|
||||
else if (!strcasecmp(input, "nowrap"))
|
||||
|
|
|
|||
|
|
@ -95,9 +95,7 @@ static const rcoption rcopts[] = {
|
|||
{"backup", BACKUP_FILE},
|
||||
{"backupdir", 0},
|
||||
{"casesensitive", CASE_SENSITIVE},
|
||||
{"cut", CUT_FROM_CURSOR}, /* deprecated form, remove end of 2018 */
|
||||
{"cutfromcursor", CUT_FROM_CURSOR},
|
||||
{"justifytrim", TRIM_BLANKS}, /* deprecated form, remove end of 2018 */
|
||||
{"locking", LOCKING},
|
||||
{"matchbrackets", 0},
|
||||
{"noconvert", NO_CONVERT},
|
||||
|
|
|
|||
Loading…
Reference in New Issue