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 53fc256c44d28afd44ac7aa9ff40786994a2960f..b31973aa9fb2c8b5951127fbb04e75a00ea8b8a4 100644 (file)
--- 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 bf6fea54591b6ec54af2a599091528e9e0fcbfee..936c73a7680666e85866f0665028d9e5286bd575 100644 (file)
--- 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;