summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-01-09 23:33:09 +0000
committerRichard M. Stallman <rms@gnu.org>1998-01-09 23:33:09 +0000
commit88bc3111a71dbb15f92f75c6af2f9b8df3c39345 (patch)
tree73cab0c1bf05922a20fa4728479a99c5050af1f0
parentc872c6b297d119b93351d42b6d9865812ecf29bf (diff)
downloademacs-88bc3111a71dbb15f92f75c6af2f9b8df3c39345.tar.gz
(Fcall_interactively): Allocate string by bytes.
Use message_with_string.
-rw-r--r--src/callint.c8
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.")
{
/* Make a copy of string so that if a GC relocates specs,
`string' will still be valid. */
- string = (unsigned char *) alloca (XSTRING (specs)->size + 1);
- bcopy (XSTRING (specs)->data, string, XSTRING (specs)->size + 1);
+ string = (unsigned char *) alloca (XSTRING (specs)->size_byte + 1);
+ bcopy (XSTRING (specs)->data, string, XSTRING (specs)->size_byte + 1);
}
else if (string == 0)
{
@@ -487,10 +487,10 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
break;
case 'c': /* Character */
- /* Use message_nolog rather than message1_nolog here,
+ /* Use message_with_string rather than message1_nolog here,
so that nothing bad happens if callint_message is changed
within Fread_char (by a timer, for example). */
- message_nolog ("%s", callint_message);
+ message_with_string ("%s", build_string (callint_message), 0);
args[i] = Fread_char ();
message1_nolog ((char *) 0);
/* Passing args[i] directly stimulates compiler bug */