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

Uppercasing only the first two or three characters of a key name, 

in order to preserve ^Space and M-Space, so these can be unbound.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4747 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-08 11:43:50 +00:00
parent 2cdaaacb19
commit f7c5eeed2d
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,9 @@
2014-04-08 Benno Schulenberg <bensberg@justemail.net> 2014-04-08 Benno Schulenberg <bensberg@justemail.net>
* src/rcfile.c (parse_binding): Melt the binding and unbinding code, * src/rcfile.c (parse_binding): Melt the binding and unbinding code,
which are very similar, into a single function. which are very similar, into a single function.
* src/rcfile.c (parse_binding): Uppercase only the first two or three
characters of the key name, in order to preserve ^Space and M-Space,
so they can be unbound. Fixes Savannah bug #41940.
2014-04-07 Benno Schulenberg <bensberg@justemail.net> 2014-04-07 Benno Schulenberg <bensberg@justemail.net>
* src/{proto.h,global.c,text.c}: Keep a pointer to the Uncut item in * src/{proto.h,global.c,text.c}: Keep a pointer to the Uncut item in

42
src/rcfile.c
View File

@ -462,11 +462,12 @@ int check_bad_binding(sc *s)
return 0; return 0;
} }
/* Bind or unbind a key combo, to or from a function. */
void parse_binding(char *ptr, bool dobind) void parse_binding(char *ptr, bool dobind)
{ {
char *keyptr = NULL, *keycopy = NULL, *funcptr = NULL, *menuptr = NULL; char *keyptr = NULL, *keycopy = NULL, *funcptr = NULL, *menuptr = NULL;
sc *s, *newsc = NULL; sc *s, *newsc = NULL;
int i, menu; int menu;
assert(ptr != NULL); assert(ptr != NULL);
@ -482,12 +483,26 @@ void parse_binding(char *ptr, bool dobind)
keyptr = ptr; keyptr = ptr;
ptr = parse_next_word(ptr); ptr = parse_next_word(ptr);
keycopy = mallocstrcpy(NULL, keyptr); keycopy = mallocstrcpy(NULL, keyptr);
for (i = 0; i < strlen(keycopy); i++)
keycopy[i] = toupper(keycopy[i]); if (strlen(keycopy) < 2) {
rcfile_error(N_("Key name is too short"));
return;
}
/* Uppercase only the first two or three characters of the key name. */
keycopy[0] = toupper(keycopy[0]);
keycopy[1] = toupper(keycopy[1]);
if (keycopy[0] == 'M' && keycopy[1] == '-') {
if (strlen(keycopy) > 2)
keycopy[2] = toupper(keycopy[2]);
else {
rcfile_error(N_("Key name is too short"));
return;
}
}
if (keycopy[0] != 'M' && keycopy[0] != '^' && keycopy[0] != 'F' && keycopy[0] != 'K') { if (keycopy[0] != 'M' && keycopy[0] != '^' && keycopy[0] != 'F' && keycopy[0] != 'K') {
rcfile_error( rcfile_error(N_("Key name must begin with \"^\", \"M\", or \"F\""));
N_("Keybindings must begin with \"^\", \"M\", or \"F\""));
return; return;
} }
@ -505,28 +520,25 @@ void parse_binding(char *ptr, bool dobind)
ptr = parse_next_word(ptr); ptr = parse_next_word(ptr);
if (!strcmp(menuptr, "")) { if (!strcmp(menuptr, "")) {
rcfile_error( /* TRANSLATORS: do not translate the word "all". */
/* TRANSLATORS: do not translate the word "all". */ rcfile_error(N_("Must specify menu in which to bind/unbind key (or \"all\")"));
N_("Must specify menu to bind key to (or \"all\")"));
return; return;
} }
menu = strtomenu(menuptr); menu = strtomenu(menuptr);
if (menu < 1) {
rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
return;
}
if (dobind) { if (dobind) {
newsc = strtosc(menu, funcptr); newsc = strtosc(menu, funcptr);
if (newsc == NULL) { if (newsc == NULL) {
rcfile_error(N_("Could not map name \"%s\" to a function"), funcptr); rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
return; return;
} }
} }
if (menu < 1) {
rcfile_error(
N_("Could not map name \"%s\" to a menu"), menuptr);
return;
}
#ifdef DEBUG #ifdef DEBUG
if (dobind) if (dobind)
fprintf(stderr, "newsc now address %d, func assigned = %d, menu = %x\n", fprintf(stderr, "newsc now address %d, func assigned = %d, menu = %x\n",