* src/eval.c (Fdefvar): Record specialness before computing initial value.

* lisp/emacs-lisp/bytecomp.el (byte-compile-track-mouse): Don't use #'.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/eval.c b/src/eval.c
index 7104a8a8396..36acca01c8b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -855,6 +855,10 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
   tem = Fdefault_boundp (sym);
   if (!NILP (tail))
     {
+      if (SYMBOLP (sym))
+        /* Do it before evaluating the initial value, for self-references.  */
+        XSYMBOL (sym)->declared_special = 1;
+
       if (SYMBOL_CONSTANT_P (sym))
         {
           /* For upward compatibility, allow (defvar :foo (quote :foo)).  */
@@ -893,9 +897,6 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
           Fput (sym, Qvariable_documentation, tem);
         }
       LOADHIST_ATTACH (sym);
-
-      if (SYMBOLP (sym))
-        XSYMBOL (sym)->declared_special = 1;
     }
   else if (!NILP (Vinternal_interpreter_environment)
            && !XSYMBOL (sym)->declared_special)