Improving two error messages, and complaining about

wrong menu names after wrong function names.

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

diff --git a/ChangeLog b/ChangeLog
index a468480d3658f5fd7e571128ff63602d19ffbfa9..8a4f7c1494759956be1ec4d6d16d80774a2d99e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
        * src/rcfile.c (parse_binding): K-keys no longer exist.
        * src/global.c, src/rcfile.c, doc/nanorc.sample.in: Allow the
        codes from the Ins and Del keys to be rebound.
+       * src/rcfile.c (parse_binding): Improve two error messages, and
+       complain about wrong menu names after wrong function names.
 
 2014-04-16  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c (get_mouseinput): Properly find also the zeroeth

diff --git a/src/rcfile.c b/src/rcfile.c
index fccadb633e8be777ab319ba9009e9c104fb400be..f5f1e947e80a93a4ce1c88d6bcf2cda369b04002 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -513,7 +513,7 @@ void parse_binding(char *ptr, bool dobind)
        ptr = parse_next_word(ptr);
 
        if (!strcmp(funcptr, "")) {
-           rcfile_error(N_("Must specify function to bind key to"));
+           rcfile_error(N_("Must specify a function to bind the key to"));
            return;
        }
     }
@@ -523,13 +523,7 @@ void parse_binding(char *ptr, bool dobind)
 
     if (!strcmp(menuptr, "")) {
        /* TRANSLATORS: Do not translate the word "all". */
-       rcfile_error(N_("Must specify menu in which to bind/unbind key (or \"all\")"));
-       return;
-    }
-
-    menu = strtomenu(menuptr);
-    if (menu < 1) {
-       rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
+       rcfile_error(N_("Must specify a menu (or \"all\") in which to bind/unbind the key"));
        return;
     }
 
@@ -541,6 +535,12 @@ void parse_binding(char *ptr, bool dobind)
        }
     }
 
+    menu = strtomenu(menuptr);
+    if (menu < 1) {
+       rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
+       return;
+    }
+
 #ifdef DEBUG
     if (dobind)
        fprintf(stderr, "newsc address is now %ld, assigned func = %ld, menu = %x\n",