diff options
| author | Richard M. Stallman | 1998-01-09 23:33:09 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-01-09 23:33:09 +0000 |
| commit | 88bc3111a71dbb15f92f75c6af2f9b8df3c39345 (patch) | |
| tree | 73cab0c1bf05922a20fa4728479a99c5050af1f0 /src | |
| parent | c872c6b297d119b93351d42b6d9865812ecf29bf (diff) | |
| download | emacs-88bc3111a71dbb15f92f75c6af2f9b8df3c39345.tar.gz emacs-88bc3111a71dbb15f92f75c6af2f9b8df3c39345.zip | |
(Fcall_interactively): Allocate string by bytes.
Use message_with_string.
Diffstat (limited to 'src')
| -rw-r--r-- | src/callint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/callint.c b/src/callint.c index e947143ebe0..0fb5e94082d 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -288,8 +288,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.") | |||
| 288 | { | 288 | { |
| 289 | /* Make a copy of string so that if a GC relocates specs, | 289 | /* Make a copy of string so that if a GC relocates specs, |
| 290 | `string' will still be valid. */ | 290 | `string' will still be valid. */ |
| 291 | string = (unsigned char *) alloca (XSTRING (specs)->size + 1); | 291 | string = (unsigned char *) alloca (XSTRING (specs)->size_byte + 1); |
| 292 | bcopy (XSTRING (specs)->data, string, XSTRING (specs)->size + 1); | 292 | bcopy (XSTRING (specs)->data, string, XSTRING (specs)->size_byte + 1); |
| 293 | } | 293 | } |
| 294 | else if (string == 0) | 294 | else if (string == 0) |
| 295 | { | 295 | { |
| @@ -487,10 +487,10 @@ Otherwise, this is done only if an arg is read using the minibuffer.") | |||
| 487 | break; | 487 | break; |
| 488 | 488 | ||
| 489 | case 'c': /* Character */ | 489 | case 'c': /* Character */ |
| 490 | /* Use message_nolog rather than message1_nolog here, | 490 | /* Use message_with_string rather than message1_nolog here, |
| 491 | so that nothing bad happens if callint_message is changed | 491 | so that nothing bad happens if callint_message is changed |
| 492 | within Fread_char (by a timer, for example). */ | 492 | within Fread_char (by a timer, for example). */ |
| 493 | message_nolog ("%s", callint_message); | 493 | message_with_string ("%s", build_string (callint_message), 0); |
| 494 | args[i] = Fread_char (); | 494 | args[i] = Fread_char (); |
| 495 | message1_nolog ((char *) 0); | 495 | message1_nolog ((char *) 0); |
| 496 | /* Passing args[i] directly stimulates compiler bug */ | 496 | /* Passing args[i] directly stimulates compiler bug */ |