ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
Benno Schulenberg 2014-04-21 18:12:29 +00:00
parent 94b1d01bb4
commit e15abc9c1e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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

16
src/rcfile.c
View File

@ -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",