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

[Richard M. Stallman]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.194 emacs/src/eval.c:1.195
*** emacs/src/eval.c:1.194      Mon Jul 15 11:37:51 2002
--- emacs/src/eval.c    Fri Aug 23 23:19:23 2002
***************
*** 87,93 ****
  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;
--- 87,93 ----
  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;
***************
*** 731,737 ****
    sym->indirect_variable = 1;
    sym->value = aliased;
    sym->constant = SYMBOL_CONSTANT_P (aliased);
!   LOADHIST_ATTACH (symbol);
    if (!NILP (docstring))
      Fput (symbol, Qvariable_documentation, docstring);
  
--- 731,737 ----
    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);
  
***************
*** 777,790 ****
            tem = Fpurecopy (tem);
          Fput (sym, Qvariable_documentation, tem);
        }
!       LOADHIST_ATTACH (sym);
      }
    else
!     /* A (defvar <var>) should not take precedence in the load-history over
!        an earlier (defvar <var> <val>), so only add to history if the default
!        value is still unbound.  */
!     if (NILP (tem))
!       LOADHIST_ATTACH (sym);
      
    return sym;
  }
--- 777,788 ----
            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.
!        It could get in the way of other definitions, and unloading this
!        package could try to make the variable unbound.  */
      
    return sym;
  }
***************
*** 817,823 ****
        tem = Fpurecopy (tem);
        Fput (sym, Qvariable_documentation, tem);
      }
!   LOADHIST_ATTACH (sym);
    return sym;
  }
  
--- 815,821 ----
        tem = Fpurecopy (tem);
        Fput (sym, Qvariable_documentation, tem);
      }
!   LOADHIST_ATTACH (Fcons (Qdefvar, sym));
    return sym;
  }
  
***************
*** 3308,3313 ****
--- 3306,3314 ----
  
    Qdefun = intern ("defun");
    staticpro (&Qdefun);
+ 
+   Qdefvar = intern ("defvar");
+   staticpro (&Qdefvar);
  
    Qand_rest = intern ("&rest");
    staticpro (&Qand_rest);