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

rcfile: rename 'nowrap' toggle to 'breaklonglines', to match the option 

Now all toggle functions have the same name as their corresponding
long command-line option.  Also, all names now indicate the effect
of the toggle when it is invoked from a default setting.
master
Benno Schulenberg 2021-01-02 17:06:36 +01:00
parent 67cdd71352
commit e14127b843
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/nano.texi
View File

@ -1678,8 +1678,9 @@ is the beginning of a paragraph.
Toggles whether cutting text will cut the whole line or just from the current cursor Toggles whether cutting text will cut the whole line or just from the current cursor
position to the end of the line. position to the end of the line.
@item nowrap @item breaklonglines
Toggles whether long lines will be hard-wrapped to the next line. Toggles whether long lines will be hard-wrapped to the next line.
(The old name of this function, 'nowrap', is deprecated.)
@item tabstospaces @item tabstospaces
Toggles whether typed tabs will be converted to spaces. Toggles whether typed tabs will be converted to spaces.

3
doc/nanorc.5
View File

@ -918,8 +918,9 @@ is the beginning of a paragraph.
Toggles whether cutting text will cut the whole line or just from the current cursor Toggles whether cutting text will cut the whole line or just from the current cursor
position to the end of the line. position to the end of the line.
.TP .TP
.B nowrap .B breaklonglines
Toggles whether long lines will be hard-wrapped to the next line. Toggles whether long lines will be hard-wrapped to the next line.
(The old name of this function, 'nowrap', is deprecated.)
.TP .TP
.B tabstospaces .B tabstospaces
Toggles whether typed tabs will be converted to spaces. Toggles whether typed tabs will be converted to spaces.

3
src/rcfile.c
View File

@ -476,7 +476,8 @@ keystruct *strtosc(const char *input)
else if (!strcmp(input, "cutfromcursor")) else if (!strcmp(input, "cutfromcursor"))
s->toggle = CUT_FROM_CURSOR; s->toggle = CUT_FROM_CURSOR;
#ifdef ENABLE_WRAPPING #ifdef ENABLE_WRAPPING
else if (!strcmp(input, "nowrap")) else if (!strcmp(input, "breaklonglines") ||
!strcmp(input, "nowrap")) /* Deprecated; remove in 2024. */
s->toggle = BREAK_LONG_LINES; s->toggle = BREAK_LONG_LINES;
#endif #endif
else if (!strcmp(input, "tabstospaces")) else if (!strcmp(input, "tabstospaces"))