Putting ^B and ^F in the same order as other command keys:

first the backward, then the forward motion.

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

diff --git a/ChangeLog b/ChangeLog
index 88540f4f64539f97dc869c726b86f5e9d362f73b..bacaf51367826bad313f494ae837cf2f3465edba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
        * src/{nano.h,proto.h,color.c,cut.c,files.c,global.c,help.c,nano.c,
        search.c,text.c,utils.c} - Add, fix, and remove some #endif comments,
        remove an obsolete comment, and remove some superfluous #ifndefs.
+       * src/global.c (shortcut_init) - Put ^B and ^F in the same order as
+       all other command keys: first the backward then the forward motion.
 
 2014-03-16  Benno Schulenberg  <bensberg@justemail.net>
        * src/nano.h - Display more help items when the terminal is wider.

diff --git a/src/global.c b/src/global.c
index b84be91fbed9d22c1f3221197b16278142b7c538..6d01aba8d56595449e474a38ea6492880e1bb470 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -903,25 +903,20 @@ void shortcut_init(bool unjustify)
     }
 #endif /* !NANO_TINY */
 
-    add_to_funcs(do_right, MMAIN, N_("Forward"), IFSCHELP(nano_forward_msg),
-       FALSE, VIEW);
-
-#ifndef DISABLE_BROWSER
-    add_to_funcs(do_right, MBROWSER, N_("Forward"), IFSCHELP(nano_forwardfile_msg),
-       FALSE, VIEW);
-#endif
-
-    add_to_funcs(do_right, MALL, "", "", FALSE, VIEW);
-
     add_to_funcs(do_left, MMAIN, N_("Back"), IFSCHELP(nano_back_msg),
        FALSE, VIEW);
+    add_to_funcs(do_right, MMAIN, N_("Forward"), IFSCHELP(nano_forward_msg),
+       FALSE, VIEW);
 
 #ifndef DISABLE_BROWSER
     add_to_funcs(do_left, MBROWSER, N_("Back"), IFSCHELP(nano_backfile_msg),
        FALSE, VIEW);
+    add_to_funcs(do_right, MBROWSER, N_("Forward"), IFSCHELP(nano_forwardfile_msg),
+       FALSE, VIEW);
 #endif
 
     add_to_funcs(do_left, MALL, "", "", FALSE, VIEW);
+    add_to_funcs(do_right, MALL, "", "", FALSE, VIEW);
 
 #ifndef NANO_TINY
     add_to_funcs(do_prev_word_void, MMAIN, N_("Prev Word"),