diff options
Diffstat (limited to 'src/callint.c')
| -rw-r--r-- | src/callint.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/callint.c b/src/callint.c index 38431226508..25096af5068 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -331,12 +331,9 @@ invoke it. If KEYS is omitted or nil, the return value of | |||
| 331 | 331 | ||
| 332 | /* If SPECS is set to a string, use it as an interactive prompt. */ | 332 | /* If SPECS is set to a string, use it as an interactive prompt. */ |
| 333 | if (STRINGP (specs)) | 333 | if (STRINGP (specs)) |
| 334 | { | 334 | /* Make a copy of string so that if a GC relocates specs, |
| 335 | /* Make a copy of string so that if a GC relocates specs, | 335 | `string' will still be valid. */ |
| 336 | `string' will still be valid. */ | 336 | string = xlispstrdupa (specs); |
| 337 | string = alloca (SBYTES (specs) + 1); | ||
| 338 | memcpy (string, SSDATA (specs), SBYTES (specs) + 1); | ||
| 339 | } | ||
| 340 | else | 337 | else |
| 341 | { | 338 | { |
| 342 | Lisp_Object input; | 339 | Lisp_Object input; |
| @@ -529,7 +526,7 @@ invoke it. If KEYS is omitted or nil, the return value of | |||
| 529 | make_number (SCHARS (callint_message)), | 526 | make_number (SCHARS (callint_message)), |
| 530 | Qface, Qminibuffer_prompt, callint_message); | 527 | Qface, Qminibuffer_prompt, callint_message); |
| 531 | args[i] = Fread_char (callint_message, Qnil, Qnil); | 528 | args[i] = Fread_char (callint_message, Qnil, Qnil); |
| 532 | message1_nolog ((char *) 0); | 529 | message1_nolog (0); |
| 533 | /* Passing args[i] directly stimulates compiler bug. */ | 530 | /* Passing args[i] directly stimulates compiler bug. */ |
| 534 | teml = args[i]; | 531 | teml = args[i]; |
| 535 | /* See bug#8479. */ | 532 | /* See bug#8479. */ |