/[emacs]/emacs/src/callint.c
ViewVC logotype

Diff of /emacs/src/callint.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.117 by lektu, Thu Jul 11 14:08:44 2002 UTC revision 1.118 by raeburn, Mon Jul 15 00:00:35 2002 UTC
# Line 288  supply if the command inquires which eve Line 288  supply if the command inquires which eve
288      {      {
289        /* Make a copy of string so that if a GC relocates specs,        /* Make a copy of string so that if a GC relocates specs,
290           `string' will still be valid.  */           `string' will still be valid.  */
291        string = (unsigned char *) alloca (STRING_BYTES (XSTRING (specs)) + 1);        string = (unsigned char *) alloca (SBYTES (specs) + 1);
292        bcopy (XSTRING (specs)->data, string,        bcopy (SDATA (specs), string,
293               STRING_BYTES (XSTRING (specs)) + 1);               SBYTES (specs) + 1);
294      }      }
295    else if (string == 0)    else if (string == 0)
296      {      {
# Line 453  supply if the command inquires which eve Line 453  supply if the command inquires which eve
453          argstrings[j]          argstrings[j]
454            = (EQ (visargs[j], Qnil)            = (EQ (visargs[j], Qnil)
455               ? (unsigned char *) ""               ? (unsigned char *) ""
456               : XSTRING (visargs[j])->data);               : SDATA (visargs[j]));
457    
458        /* Process the format-string in prompt1, putting the output        /* Process the format-string in prompt1, putting the output
459           into callint_message.  Make callint_message bigger if necessary.           into callint_message.  Make callint_message bigger if necessary.
# Line 599  supply if the command inquires which eve Line 599  supply if the command inquires which eve
599            if (next_event >= key_count)            if (next_event >= key_count)
600              error ("%s must be bound to an event with parameters",              error ("%s must be bound to an event with parameters",
601                     (SYMBOLP (function)                     (SYMBOLP (function)
602                      ? (char *) XSTRING (SYMBOL_NAME (function))->data                      ? (char *) SDATA (SYMBOL_NAME (function))
603                      : "command"));                      : "command"));
604            args[i] = XVECTOR (keys)->contents[next_event++];            args[i] = XVECTOR (keys)->contents[next_event++];
605            varies[i] = -1;            varies[i] = -1;
# Line 644  supply if the command inquires which eve Line 644  supply if the command inquires which eve
644                  tem = Fread_from_minibuffer (build_string (callint_message),                  tem = Fread_from_minibuffer (build_string (callint_message),
645                                               Qnil, Qnil, Qnil, Qnil, Qnil,                                               Qnil, Qnil, Qnil, Qnil, Qnil,
646                                               Qnil);                                               Qnil);
647                  if (! STRINGP (tem) || XSTRING (tem)->size == 0)                  if (! STRINGP (tem) || SCHARS (tem) == 0)
648                    args[i] = Qnil;                    args[i] = Qnil;
649                  else                  else
650                    args[i] = Fread (tem);                    args[i] = Fread (tem);

Legend:
Removed from v.1.117  
changed lines
  Added in v.1.118

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26