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

[Richard M . Stallman]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.231 emacs/src/eval.c:1.232
*** emacs/src/eval.c:1.231      Tue Dec 21 11:33:57 2004
--- emacs/src/eval.c    Mon Dec 27 16:02:24 2004
***************
*** 88,94 ****
  int gcpro_level;
  #endif
  
! Lisp_Object Qautoload, Qmacro, Qexit, Qinteractive, Qcommandp, Qdefun, 
Qdefvar;
  Lisp_Object Qinhibit_quit, Vinhibit_quit, Vquit_flag;
  Lisp_Object Qand_rest, Qand_optional;
  Lisp_Object Qdebug_on_error;
--- 88,94 ----
  int gcpro_level;
  #endif
  
! Lisp_Object Qautoload, Qmacro, Qexit, Qinteractive, Qcommandp, Qdefun;
  Lisp_Object Qinhibit_quit, Vinhibit_quit, Vquit_flag;
  Lisp_Object Qand_rest, Qand_optional;
  Lisp_Object Qdebug_on_error;
***************
*** 647,653 ****
        && EQ (XCAR (XSYMBOL (fn_name)->function), Qautoload))
      LOADHIST_ATTACH (Fcons (Qt, fn_name));
    Ffset (fn_name, defn);
!   LOADHIST_ATTACH (fn_name);
    return fn_name;
  }
  
--- 647,653 ----
        && EQ (XCAR (XSYMBOL (fn_name)->function), Qautoload))
      LOADHIST_ATTACH (Fcons (Qt, fn_name));
    Ffset (fn_name, defn);
!   LOADHIST_ATTACH (Fcons (Qdefun, fn_name));
    return fn_name;
  }
  
***************
*** 716,722 ****
        && EQ (XCAR (XSYMBOL (fn_name)->function), Qautoload))
      LOADHIST_ATTACH (Fcons (Qt, fn_name));
    Ffset (fn_name, defn);
!   LOADHIST_ATTACH (fn_name);
    return fn_name;
  }
  
--- 716,722 ----
        && EQ (XCAR (XSYMBOL (fn_name)->function), Qautoload))
      LOADHIST_ATTACH (Fcons (Qt, fn_name));
    Ffset (fn_name, defn);
!   LOADHIST_ATTACH (Fcons (Qdefun, fn_name));
    return fn_name;
  }
  
***************
*** 742,748 ****
    sym->indirect_variable = 1;
    sym->value = aliased;
    sym->constant = SYMBOL_CONSTANT_P (aliased);
!   LOADHIST_ATTACH (Fcons (Qdefvar, symbol));
    if (!NILP (docstring))
      Fput (symbol, Qvariable_documentation, docstring);
  
--- 742,748 ----
    sym->indirect_variable = 1;
    sym->value = aliased;
    sym->constant = SYMBOL_CONSTANT_P (aliased);
!   LOADHIST_ATTACH (symbol);
    if (!NILP (docstring))
      Fput (symbol, Qvariable_documentation, docstring);
  
***************
*** 810,816 ****
            tem = Fpurecopy (tem);
          Fput (sym, Qvariable_documentation, tem);
        }
!       LOADHIST_ATTACH (Fcons (Qdefvar, sym));
      }
    else
      /* Simple (defvar <var>) should not count as a definition at all.
--- 810,816 ----
            tem = Fpurecopy (tem);
          Fput (sym, Qvariable_documentation, tem);
        }
!       LOADHIST_ATTACH (sym);
      }
    else
      /* Simple (defvar <var>) should not count as a definition at all.
***************
*** 853,859 ****
        tem = Fpurecopy (tem);
        Fput (sym, Qvariable_documentation, tem);
      }
!   LOADHIST_ATTACH (Fcons (Qdefvar, sym));
    return sym;
  }
  
--- 853,859 ----
        tem = Fpurecopy (tem);
        Fput (sym, Qvariable_documentation, tem);
      }
!   LOADHIST_ATTACH (sym);
    return sym;
  }
  
***************
*** 3376,3384 ****
    Qdefun = intern ("defun");
    staticpro (&Qdefun);
  
-   Qdefvar = intern ("defvar");
-   staticpro (&Qdefvar);
- 
    Qand_rest = intern ("&rest");
    staticpro (&Qand_rest);
  
--- 3376,3381 ----