diff options
| author | Joakim Verona | 2013-09-10 23:52:26 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-10 23:52:26 +0200 |
| commit | 63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c (patch) | |
| tree | e5078c5545c777e21944a9ee4199a6f2c6d25ca9 /src/callint.c | |
| parent | 92aeabcc8a007f521a664e3aee092eb80ad0f49a (diff) | |
| download | emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.tar.gz emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.zip | |
merge upstream
Diffstat (limited to 'src/callint.c')
| -rw-r--r-- | src/callint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/callint.c b/src/callint.c index 25096af5068..d31604b070e 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -616,8 +616,8 @@ invoke it. If KEYS is omitted or nil, the return value of | |||
| 616 | Fput_text_property (make_number (0), | 616 | Fput_text_property (make_number (0), |
| 617 | make_number (SCHARS (callint_message)), | 617 | make_number (SCHARS (callint_message)), |
| 618 | Qface, Qminibuffer_prompt, callint_message); | 618 | Qface, Qminibuffer_prompt, callint_message); |
| 619 | args[i] = Fread_key_sequence (callint_message, | 619 | args[i] = Fread_key_sequence_vector (callint_message, |
| 620 | Qnil, Qt, Qnil, Qnil); | 620 | Qnil, Qt, Qnil, Qnil); |
| 621 | teml = args[i]; | 621 | teml = args[i]; |
| 622 | visargs[i] = Fkey_description (teml, Qnil); | 622 | visargs[i] = Fkey_description (teml, Qnil); |
| 623 | unbind_to (speccount1, Qnil); | 623 | unbind_to (speccount1, Qnil); |