nano

commit eec71e31a0c8c6f88c3aaadd134c1c8337e987a4
parent 90a43c3c274d6a9794781239d7e919bae15ef019
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Wed, 19 Mar 2014 09:34:37 +0000

Allowing softwrap to be rebound.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4655 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
3
++-
M
doc/man/nanorc.5
 | 
3
+++
M
src/global.c
 | 
7
+++++--

3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
-2014-03-18  Benno Schulenberg  <bensberg@justemail.net>
+2014-03-19  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/nanorc.sample.in - Document the changed whitespace defaults.
+	* src/global.c, doc/man/nanorc.5 - Allow softwrap to be rebound.
 
 2014-03-18  Benno Schulenberg  <bensberg@justemail.net>
 	* src/global.c (shortcut_init) - In the file browser one cannot
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
@@ -524,6 +524,9 @@ position to the end of the line.
 .B nowrap
 Toggle whether long lines will be wrapped to the next line.
 .TP
+.B softwrap
+Toggle whether long lines will be displayed over multiple screen lines.
+.TP
 .B suspendenable
 Toggle whether the suspend sequence (normally ^Z) will suspend the editor window.
 .TP
diff --git a/src/global.c b/src/global.c
@@ -1484,8 +1484,7 @@ sc *strtosc(int menu, char *input)
     } else if (!strcasecmp(input, "nexthistory")) {
 	s->scfunc =  get_history_newer_void;
 	s->execute = FALSE;
-    } else if (!strcasecmp(input, "nohelp") ||
-	       !strcasecmp(input, "nohelp")) {
+    } else if (!strcasecmp(input, "nohelp")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = NO_HELP;
@@ -1525,6 +1524,10 @@ sc *strtosc(int menu, char *input)
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = NO_WRAP;
+    } else if (!strcasecmp(input, "softwrap")) {
+	s->scfunc =  do_toggle_void;
+	s->execute = FALSE;
+	s->toggle = SOFTWRAP;
     } else if (!strcasecmp(input, "tabstospaces")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;