From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 21 Apr 2014 11:15:48 +0000 (+0000)
Subject: Putting meta first, for clarity.
X-Git-Tag: v2.3.3~141
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=bb8c9031a48d82fea0b5b9b06e094a8824edbe4e;p=nano.git

Putting meta first, for clarity.


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

diff --git a/ChangeLog b/ChangeLog
index 53fc256c..b31973aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 	* doc/syntax/nanorc.nanorc: There is no F0 key.
 	* src/global.c (first_sc_for): Adjust two comments -- the help
 	viewer no longer sorts keys to be control first, meta second.
+	* src/global.c (first_sc_for): Put meta first, for clarity.
 
 2014-04-16  Benno Schulenberg  <bensberg@justemail.net>
 	* src/winio.c (get_mouseinput): Properly find also the zeroeth
diff --git a/src/global.c b/src/global.c
index bf6fea54..936c73a7 100644
--- a/src/global.c
+++ b/src/global.c
@@ -323,14 +323,14 @@ const sc *first_sc_for(int menu, void (*func)(void))
 	     * and first dedicated key.  The latter is needed to be
 	     * able to show something when the user has rebound all
 	     * other sequences for a specific func. */
-	    if (s->type == FKEY) {
-		if (!fkeysc)
-		    fkeysc = s;
-		continue;
-	    } else if (s->type == META) {
+	    if (s->type == META) {
 		if (!metasc)
 		    metasc = s;
 		continue;
+	    } else if (s->type == FKEY) {
+		if (!fkeysc)
+		    fkeysc = s;
+		continue;
 	    } else if (s->type == RAWINPUT) {
 		if (!rawsc)
 		    rawsc = s;
@@ -344,10 +344,10 @@ const sc *first_sc_for(int menu, void (*func)(void))
 
     /* If we did not find any control sequence, then prefer a
      * meta sequence over a function key over a dedicated key. */
-    if (fkeysc && !metasc)
-	return fkeysc;
-    else if (metasc)
+    if (metasc)
 	return metasc;
+    else if (fkeysc)
+	return fkeysc;
     else if (rawsc)
 	return rawsc;