Unfolding long lines that add shortcuts, for visual consistency.

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

diff --git a/ChangeLog b/ChangeLog
index 01c8141da1912695b54384c8d4b1339d05de7585..019f81157bf2c20e48e26434dc32c4789e440d8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
        * src/*.h, src/*.c: Add the ability to colour four elements of
        nano's interface differently: title bar, status bar, key combo,
        and function tag.  Idea and original patch by Mark Majeres.
+       * src/global.c (shortcut_init): Unfold long lines consistently.
 
 2014-04-30  Benno Schulenberg  <bensberg@justemail.net>
        * src/*, doc/*: Update the years in the copyright notices -- there

diff --git a/src/global.c b/src/global.c
index 7d70f3fe95fc340fd014488f491c13aa9223efed..18764fe783490e37884d933567f43b15ba09691f 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1067,30 +1067,23 @@ void shortcut_init(void)
     add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "Down", get_history_newer_void, 0, FALSE);
 #endif
 #ifndef DISABLE_JUSTIFY
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH,
-       "^W", do_para_begin_void, 0, TRUE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH,
-       "^O", do_para_end_void, 0, TRUE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "^W", do_para_begin_void, 0, TRUE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "^O", do_para_end_void, 0, TRUE);
     add_to_sclist(MMOST, "M-(", do_para_begin_void, 0, TRUE);
     add_to_sclist(MMOST, "M-9", do_para_begin_void, 0, TRUE);
     add_to_sclist(MMOST, "M-)", do_para_end_void, 0, TRUE);
     add_to_sclist(MMOST, "M-0", do_para_end_void, 0, TRUE);
 #endif
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH,
-       "M-C", case_sens_void, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH,
-       "M-B", backwards_void, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH,
-       "M-R", regexp_void, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "M-C", case_sens_void, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "M-B", backwards_void, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "M-R", regexp_void, 0, FALSE);
 
     add_to_sclist(MMAIN|MHELP, "M-\\", do_first_line, 0, TRUE);
     add_to_sclist(MMAIN|MHELP, "M-|", do_first_line, 0, TRUE);
     add_to_sclist(MMAIN|MHELP, "M-/", do_last_line, 0, TRUE);
     add_to_sclist(MMAIN|MHELP, "M-?", do_last_line, 0, TRUE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE,
-       "^Y", do_first_line, 0, TRUE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE,
-       "^V", do_last_line, 0, TRUE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^Y", do_first_line, 0, TRUE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^V", do_last_line, 0, TRUE);
 
 #ifndef DISABLE_BROWSER
     add_to_sclist(MBROWSER|MWHEREISFILE, "M-\\", do_first_file, 0, TRUE);