From b92cbf5f09b1b260250f31d980e6aba11ced47ed Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 31 May 2024 12:49:38 +0200 Subject: [PATCH] rcfile: remove old bindable function 'nowrap', alias of 'breaklonglines' The bindable function 'nowrap' has been deprecated for three years, since version 5.5, commit e14127b8. (The obsolete options --nowrap and 'set nowrap' continue to exist.) --- doc/nano.texi | 1 - doc/nanorc.5 | 1 - src/rcfile.c | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/nano.texi b/doc/nano.texi index 7c6bd1b7..f925d529 100644 --- a/doc/nano.texi +++ b/doc/nano.texi @@ -1855,7 +1855,6 @@ position to the end of the line. @item breaklonglines Toggles whether long lines will be hard-wrapped to the next line. -(The old name of this function, 'nowrap', is deprecated.) @item tabstospaces Toggles whether typed tabs will be converted to spaces. diff --git a/doc/nanorc.5 b/doc/nanorc.5 index 5f8a9cd6..dab6701d 100644 --- a/doc/nanorc.5 +++ b/doc/nanorc.5 @@ -1005,7 +1005,6 @@ position to the end of the line. .TP .B breaklonglines Toggles whether long lines will be hard-wrapped to the next line. -(The old name of this function, 'nowrap', is deprecated.) .TP .B tabstospaces Toggles whether typed tabs will be converted to spaces. diff --git a/src/rcfile.c b/src/rcfile.c index 95271a7e..557a6962 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -470,8 +470,7 @@ keystruct *strtosc(const char *input) else if (!strcmp(input, "cutfromcursor")) s->toggle = CUT_FROM_CURSOR; #ifdef ENABLE_WRAPPING - else if (!strcmp(input, "breaklonglines") || - !strcmp(input, "nowrap")) /* Deprecated; remove in 2024. */ + else if (!strcmp(input, "breaklonglines")) s->toggle = BREAK_LONG_LINES; #endif else if (!strcmp(input, "tabstospaces"))