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

[Ken Raeburn]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.192 emacs/src/eval.c:1.193
*** emacs/src/eval.c:1.192      Fri Jul 12 07:16:42 2002
--- emacs/src/eval.c    Sun Jul 14 20:00:36 2002
***************
*** 837,843 ****
    if (INTEGERP (documentation) && XINT (documentation) < 0)
      return Qt;
    if (STRINGP (documentation)
!       && ((unsigned char) XSTRING (documentation)->data[0] == '*'))
      return Qt;
    /* If it is (STRING . INTEGER), a negative integer means a user variable.  
*/
    if (CONSP (documentation)
--- 837,843 ----
    if (INTEGERP (documentation) && XINT (documentation) < 0)
      return Qt;
    if (STRINGP (documentation)
!       && ((unsigned char) SREF (documentation, 0) == '*'))
      return Qt;
    /* If it is (STRING . INTEGER), a negative integer means a user variable.  
*/
    if (CONSP (documentation)
***************
*** 1554,1560 ****
      data = Fcons (error_symbol, data);
  
    string = Ferror_message_string (data);
!   fatal ("%s", XSTRING (string)->data, 0);
  }
  
  /* Return nonzero iff LIST is a non-nil atom or
--- 1554,1560 ----
      data = Fcons (error_symbol, data);
  
    string = Ferror_message_string (data);
!   fatal ("%s", SDATA (string), 0);
  }
  
  /* Return nonzero iff LIST is a non-nil atom or
***************
*** 1920,1926 ****
       of what files are preloaded and when.  */
    if (! NILP (Vpurify_flag))
      error ("Attempt to autoload %s while preparing to dump",
!          XSTRING (SYMBOL_NAME (funname))->data);
  
    fun = funname;
    CHECK_SYMBOL (funname);
--- 1920,1926 ----
       of what files are preloaded and when.  */
    if (! NILP (Vpurify_flag))
      error ("Attempt to autoload %s while preparing to dump",
!          SDATA (SYMBOL_NAME (funname)));
  
    fun = funname;
    CHECK_SYMBOL (funname);
***************
*** 1959,1965 ****
  
    if (!NILP (Fequal (fun, fundef)))
      error ("Autoloading failed to define function %s",
!          XSTRING (SYMBOL_NAME (funname))->data);
    UNGCPRO;
  }
  
--- 1959,1965 ----
  
    if (!NILP (Fequal (fun, fundef)))
      error ("Autoloading failed to define function %s",
!          SDATA (SYMBOL_NAME (funname)));
    UNGCPRO;
  }
  
***************
*** 2938,2944 ****
        {
          tem = AREF (object, COMPILED_BYTECODE);
          if (CONSP (tem) && STRINGP (XCAR (tem)))
!           error ("Invalid byte code in %s", XSTRING (XCAR (tem))->data);
          else
            error ("Invalid byte code");
        }
--- 2938,2944 ----
        {
          tem = AREF (object, COMPILED_BYTECODE);
          if (CONSP (tem) && STRINGP (XCAR (tem)))
!           error ("Invalid byte code in %s", SDATA (XCAR (tem)));
          else
            error ("Invalid byte code");
        }