diff --git a/doc/nano.texi b/doc/nano.texi index 441c019a..c03269ca 100644 --- a/doc/nano.texi +++ b/doc/nano.texi @@ -946,10 +946,6 @@ The line plus column numbers and the character code are displayed only when @code{set constantshow} is used, and can be toggled on and off with @key{M-C}. The state flags are displayed only when @code{set stateflags} is used. -@item set morespace -Deprecated option since it has become the default setting. -When needed, use @code{unset emptyline} instead. - @item set mouse Enable mouse support, so that mouse clicks can be used to place the cursor, set the mark (with a double click), or execute shortcuts. @@ -967,9 +963,6 @@ Don't display the help lists at the bottom of the screen. Don't automatically add a newline when a text does not end with one. (This can cause you to save non-POSIX text files.) -@item set nopauses -Obsolete option. Ignored. - @item set nowrap Deprecated option since it has become the default setting. When needed, use @code{unset breaklonglines} instead. @@ -1055,10 +1048,6 @@ jump to that beginning (either forwards or backwards). If the cursor is already at that position, it will jump to the true beginning of the line. -@item set smooth -Deprecated option since it has become the default setting. -When needed, use @code{unset jumpyscrolling} instead. - @item set softwrap Display lines that exceed the screen's width over multiple screen lines. (You can make this soft-wrapping occur at whitespace instead of rudely at diff --git a/doc/nanorc.5 b/doc/nanorc.5 index 75dda577..3f7fb708 100644 --- a/doc/nanorc.5 +++ b/doc/nanorc.5 @@ -199,10 +199,6 @@ The line plus column numbers and the character code are displayed only when \fBset constantshow\fR is used, and can be toggled on and off with \fBM-C\fR. The state flags are displayed only when \fBset stateflags\fR is used. .TP -.B set morespace -Deprecated option since it has become the default setting. -When needed, use \fBunset emptyline\fR instead. -.TP .B set mouse Enable mouse support, if available for your system. When enabled, mouse clicks can be used to place the cursor, set the mark (with a double @@ -223,9 +219,6 @@ Don't display the two help lines at the bottom of the screen. Don't automatically add a newline when a text does not end with one. (This can cause you to save non-POSIX text files.) .TP -.B set nopauses -Obsolete option. Ignored. -.TP .B set nowrap Deprecated option since it has become the default setting. When needed, use \fBunset breaklonglines\fR instead. @@ -309,10 +302,6 @@ jump to that beginning (either forwards or backwards). If the cursor is already at that position, it will jump to the true beginning of the line. .TP -.B set smooth -Deprecated option since it has become the default setting. -When needed, use \fBunset jumpyscrolling\fR instead. -.TP .B set softwrap Display lines that exceed the screen's width over multiple screen lines. (You can make this soft-wrapping occur at whitespace instead of rudely at diff --git a/src/definitions.h b/src/definitions.h index b772e498..b0037bb0 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -307,7 +307,6 @@ enum { CUT_FROM_CURSOR, BACKWARDS_SEARCH, MULTIBUFFER, - SMOOTH_SCROLL, REBIND_DELETE, RAW_SEQUENCES, NO_CONVERT, @@ -319,7 +318,6 @@ enum { RESTRICTED, SMART_HOME, WHITESPACE_DISPLAY, - MORE_SPACE, TABS_TO_SPACES, QUICK_BLANK, WORD_BOUNDS, @@ -333,7 +331,6 @@ enum { TRIM_BLANKS, SHOW_CURSOR, LINE_NUMBERS, - NO_PAUSES, AT_BLANKS, AFTER_ENDS, LET_THEM_ZAP, diff --git a/src/nano.c b/src/nano.c index f2cb0a30..4c644c3c 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1804,12 +1804,8 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif - /* Set sensible defaults, different from what Pico does. */ + /* Set a sensible default, different from what Pico does. */ SET(NO_WRAP); - SET(SMOOTH_SCROLL); - - /* Give a small visual hint that nano has changed. */ - SET(MORE_SPACE); /* If the executable's name starts with 'r', activate restricted mode. */ if (*(tail(argv[0])) == 'r') @@ -2169,13 +2165,9 @@ int main(int argc, char **argv) memmove(alt_speller, alt_speller + 1, strlen(alt_speller)); #endif - /* If an rcfile undid the default settings, copy it to the new flags. */ + /* If an rcfile undid the default setting, copy it to the new flag. */ if (!ISSET(NO_WRAP)) SET(BREAK_LONG_LINES); - if (!ISSET(SMOOTH_SCROLL)) - SET(JUMPY_SCROLLING); - if (!ISSET(MORE_SPACE)) - SET(EMPTY_LINE); /* Simply OR the boolean flags from rcfile and command line. */ for (size_t i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) diff --git a/src/rcfile.c b/src/rcfile.c index a311ebc0..474b31d4 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -60,7 +60,6 @@ static const rcoption rcopts[] = { #ifdef HAVE_LIBMAGIC {"magic", USE_MAGIC}, #endif - {"morespace", MORE_SPACE}, /* Deprecated; remove in 2021. */ #ifdef ENABLE_MOUSE {"mouse", USE_MOUSE}, #endif @@ -69,7 +68,6 @@ static const rcoption rcopts[] = { #endif {"nohelp", NO_HELP}, {"nonewlines", NO_NEWLINES}, - {"nopauses", NO_PAUSES}, /* Obsolete; remove in 2021. */ #ifdef ENABLE_WRAPPING {"nowrap", NO_WRAP}, /* Deprecated; remove in 2024. */ #endif @@ -114,7 +112,6 @@ static const rcoption rcopts[] = { {"noconvert", NO_CONVERT}, {"showcursor", SHOW_CURSOR}, {"smarthome", SMART_HOME}, - {"smooth", SMOOTH_SCROLL}, /* Deprecated; remove in 2021. */ {"softwrap", SOFTWRAP}, {"stateflags", STATEFLAGS}, {"tabsize", 0},