# HG changeset patch # User Gerd Moellmann # Date 968749829 0 # Node ID f17ccd7f6253cb8abdfd9d4f22a9f4daea7c4488 # Parent 0c59df4bb1143b26745275ad96ef6d8432ac3873 Undo last change because it breaks '(make-variable-buffer-local (defvar ...)' which is used at least in dired. diff -r 0c59df4bb114 -r f17ccd7f6253 lisp/emacs-lisp/bytecomp.el --- a/lisp/emacs-lisp/bytecomp.el Tue Sep 12 02:30:13 2000 +0000 +++ b/lisp/emacs-lisp/bytecomp.el Tue Sep 12 09:10:29 2000 +0000 @@ -3220,16 +3220,19 @@ (setq byte-compile-bound-variables (cons var byte-compile-bound-variables))) (byte-compile-body-do-effect - (list - ;; Just as a real defvar would, but only in top-level forms. - (when (null byte-compile-current-form) - `(push ',var current-load-list)) - (when (and string (null byte-compile-current-form)) - `(put ',var 'variable-documentation ,string)) - (if (cdr (cdr form)) - (if (eq (car form) 'defconst) - `(setq ,var ,value) - `(if (boundp ',var) ',var (setq ,var ,value)))))))) + (list (if (cdr (cdr form)) + (if (eq (car form) 'defconst) + (list 'setq var value) + (list 'or (list 'boundp (list 'quote var)) + (list 'setq var value)))) + ;; Put the defined variable in this library's load-history entry + ;; just as a real defvar would. + (list 'setq 'current-load-list + (list 'cons (list 'quote var) + 'current-load-list)) + (if string + (list 'put (list 'quote var) ''variable-documentation string)) + (list 'quote var))))) (defun byte-compile-autoload (form) (and (byte-compile-constp (nth 1 form))