nano

commit 57d773f8d07263de37a9c0d9f1cb12f64f0c7178
parent bb8c9031a48d82fea0b5b9b06e094a8824edbe4e
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Mon, 21 Apr 2014 11:22:54 +0000

No unnecessary checking for lowercase 'm' or 'f'.


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

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/global.c
 | 
8
++++----

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,9 @@
 	* 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.
+	* src/global.c (strtokeytype): No need to check for lowercase
+	'm' or 'f', the source doesn't use them and rc-file processing
+	uppercases them.  Also put control 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
@@ -269,11 +269,11 @@ void ext_cmd_void(void)
 /* Set type of function based on the string. */
 function_type strtokeytype(const char *str)
 {
-    if (str[0] == 'M' || str[0] == 'm')
-        return META;
-    else if (str[0] == '^')
+    if (str[0] == '^')
         return CONTROL;
-    else if (str[0] == 'F' || str[0] == 'f')
+    else if (str[0] == 'M')
+        return META;
+    else if (str[0] == 'F')
         return FKEY;
     else
 	return RAWINPUT;