[Emacs-diffs] Changes to emacs/src/callint.c

[Ken Raeburn]

Index: emacs/src/callint.c
diff -c emacs/src/callint.c:1.117 emacs/src/callint.c:1.118
*** emacs/src/callint.c:1.117   Thu Jul 11 10:08:44 2002
--- emacs/src/callint.c Sun Jul 14 20:00:35 2002
***************
*** 288,296 ****
      {
        /* Make a copy of string so that if a GC relocates specs,
         `string' will still be valid.  */
!       string = (unsigned char *) alloca (STRING_BYTES (XSTRING (specs)) + 1);
!       bcopy (XSTRING (specs)->data, string,
!            STRING_BYTES (XSTRING (specs)) + 1);
      }
    else if (string == 0)
      {
--- 288,296 ----
      {
        /* Make a copy of string so that if a GC relocates specs,
         `string' will still be valid.  */
!       string = (unsigned char *) alloca (SBYTES (specs) + 1);
!       bcopy (SDATA (specs), string,
!            SBYTES (specs) + 1);
      }
    else if (string == 0)
      {
***************
*** 453,459 ****
        argstrings[j]
          = (EQ (visargs[j], Qnil)
             ? (unsigned char *) ""
!            : XSTRING (visargs[j])->data);
  
        /* Process the format-string in prompt1, putting the output
         into callint_message.  Make callint_message bigger if necessary.
--- 453,459 ----
        argstrings[j]
          = (EQ (visargs[j], Qnil)
             ? (unsigned char *) ""
!            : SDATA (visargs[j]));
  
        /* Process the format-string in prompt1, putting the output
         into callint_message.  Make callint_message bigger if necessary.
***************
*** 599,605 ****
          if (next_event >= key_count)
            error ("%s must be bound to an event with parameters",
                   (SYMBOLP (function)
!                   ? (char *) XSTRING (SYMBOL_NAME (function))->data
                    : "command"));
          args[i] = XVECTOR (keys)->contents[next_event++];
          varies[i] = -1;
--- 599,605 ----
          if (next_event >= key_count)
            error ("%s must be bound to an event with parameters",
                   (SYMBOLP (function)
!                   ? (char *) SDATA (SYMBOL_NAME (function))
                    : "command"));
          args[i] = XVECTOR (keys)->contents[next_event++];
          varies[i] = -1;
***************
*** 644,650 ****
                tem = Fread_from_minibuffer (build_string (callint_message),
                                             Qnil, Qnil, Qnil, Qnil, Qnil,
                                             Qnil);
!               if (! STRINGP (tem) || XSTRING (tem)->size == 0)
                  args[i] = Qnil;
                else
                  args[i] = Fread (tem);
--- 644,650 ----
                tem = Fread_from_minibuffer (build_string (callint_message),
                                             Qnil, Qnil, Qnil, Qnil, Qnil,
                                             Qnil);
!               if (! STRINGP (tem) || SCHARS (tem) == 0)
                  args[i] = Qnil;
                else
                  args[i] = Fread (tem);