From: Benno Schulenberg <bensberg@justemail.net>
Date: Tue, 22 Apr 2014 19:07:32 +0000 (+0000)
Subject: Putting left/right in normal order.
X-Git-Tag: v2.3.3~125
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=47be8c2fd822b881f33b90154c7df16d3d7babb3;p=nano.git

Putting left/right in normal order.


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

diff --git a/ChangeLog b/ChangeLog
index 7d6edfab..34e37075 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	update some translator comments and shorten a few tags.
 	* src/global.c (shortcut_init): Delete unneeded empty funcs; being
 	in the list of shortcuts is enough.
+	* src/global.c (shortcut_init): Put left/right in normal order.
 
 2014-04-21  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/syntax/nanorc.nanorc: There is no F0 key.
diff --git a/src/global.c b/src/global.c
index 0ef34532..5a03bfbb 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1070,10 +1070,10 @@ void shortcut_init(void)
 	add_to_sclist(MMAIN, "M-E", do_redo, 0, TRUE);
     }
 #endif
-    add_to_sclist(MMOST, "^F", do_right, 0, TRUE);
     add_to_sclist(MMOST, "^B", do_left, 0, TRUE);
-    add_to_sclist(MMOST, "Right", do_right, 0, TRUE);
+    add_to_sclist(MMOST, "^F", do_right, 0, TRUE);
     add_to_sclist(MMOST, "Left", do_left, 0, TRUE);
+    add_to_sclist(MMOST, "Right", do_right, 0, TRUE);
 #ifndef NANO_TINY
     add_to_sclist(MMAIN, "^Space", do_next_word_void, 0, TRUE);
     add_to_sclist(MMAIN, "M-Space", do_prev_word_void, 0, TRUE);
@@ -1440,12 +1440,12 @@ sc *strtosc(char *input)
 	s->toggle = SUSPEND;
     }
 #endif /* !NANO_TINY */
-    else if (!strcasecmp(input, "right") ||
-	     !strcasecmp(input, "forward"))
-	s->scfunc = do_right;
     else if (!strcasecmp(input, "left") ||
 	     !strcasecmp(input, "back"))
 	s->scfunc = do_left;
+    else if (!strcasecmp(input, "right") ||
+	     !strcasecmp(input, "forward"))
+	s->scfunc = do_right;
     else if (!strcasecmp(input, "up") ||
 	     !strcasecmp(input, "prevline"))
 	s->scfunc = do_up_void;