procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix this-command-keys for "M-x foo" commands

Browse source 
* src/keyboard.c (Fset__this_command_keys): Don't assume KEYS is a
unibyte string.  (Bug#28798)
This commit is contained in:
Eli Zaretskii 2017-10-12 23:38:48 +03:00
parent 2f4bd2fbda
commit 59b5dc60d6
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/keyboard.c
View file

@ -10055,7 +10055,12 @@ Internal use only. */)
this_command_key_count = 0; this_command_key_count = 0;
this_single_command_key_start = 0; this_single_command_key_start = 0;
int key0 = SREF (keys, 0);
int charidx = 0, byteidx = 0;
int key0;
FETCH_STRING_CHAR_ADVANCE (key0, keys, charidx, byteidx);
if (CHAR_BYTE8_P (key0))
key0 = CHAR_TO_BYTE8 (key0);
/* Kludge alert: this makes M-x be in the form expected by /* Kludge alert: this makes M-x be in the form expected by
novice.el. (248 is \370, a.k.a. "Meta-x".) Any better ideas? */ novice.el. (248 is \370, a.k.a. "Meta-x".) Any better ideas? */
@ -10064,7 +10069,13 @@ Internal use only. */)
else else
add_command_key (make_number (key0)); add_command_key (make_number (key0));
for (ptrdiff_t i = 1; i < SCHARS (keys); i++) for (ptrdiff_t i = 1; i < SCHARS (keys); i++)
add_command_key (make_number (SREF (keys, i))); {
int key_i;
FETCH_STRING_CHAR_ADVANCE (key_i, keys, charidx, byteidx);
if (CHAR_BYTE8_P (key_i))
key_i = CHAR_TO_BYTE8 (key_i);
add_command_key (make_number (key_i));
}
return Qnil; return Qnil;
} }