Moving strtokeytype() next to its sister function.

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

diff --git a/ChangeLog b/ChangeLog
index 5d2a39fde1b45357812025fd918165e942fe3d9e..3c566f4c916063e2e69e32769d985a255311dce5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2014-07-27  Benno Schulenberg  <bensberg@justemail.net>
        * src/global.c (add_to_sclist): Remove the now unused and unneeded
        addition ability from this builder function of the shortcut list.
+       * src/global.c (strtokeytype): Move this to a better place.
 
 2014-07-24  Jordi Mallach  <jordi@gnu.org>
        * doc/texinfo/nano.texi, doc/man/nanorc.5: Typo fix.

diff --git a/src/global.c b/src/global.c
index 9db4a4332bfadc1fecc8df5acb2deca79ad6c2c6..5b2924a0287def1bfd336914d37224ac76506e78 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -285,21 +285,7 @@ void flip_execute_void(void)
 {
 }
 
-/* Set the type of command key based on the string. */
-key_type strtokeytype(const char *str)
-{
-    if (str[0] == '^')
-        return CONTROL;
-    else if (str[0] == 'M')
-        return META;
-    else if (str[0] == 'F')
-        return FKEY;
-    else
-       return RAWINPUT;
-}
-
-/* Add a string to the function list struct.
- * Does not allow updates, not yet anyway. */
+/* Add a function to the function list. */
 void add_to_funcs(void (*func)(void), int menus, const char *desc, const char *help,
     bool blank_after, bool viewok)
 {
@@ -405,6 +391,19 @@ functionptrtype func_from_key(int *kbinput)
        return NULL;
 }
 
+/* Return the type of command key based on the given string. */
+key_type strtokeytype(const char *str)
+{
+    if (str[0] == '^')
+       return CONTROL;
+    else if (str[0] == 'M')
+       return META;
+    else if (str[0] == 'F')
+       return FKEY;
+    else
+       return RAWINPUT;
+}
+
 /* Assign the info to the shortcut struct.
  * Assumes keystr is already assigned, naturally. */
 void assign_keyinfo(sc *s)