diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-30 22:15:34 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-30 22:15:34 -0700 |
| commit | 333d54dade1e7005d5a97612907158fe5ec3d310 (patch) | |
| tree | a5b18c9c6a68d71fddae98aba0d81079068a8c46 /lisp/emacs-lisp/bytecomp.el | |
| parent | 90856fe0b82ba19d1c3d73a4ba48007380201e66 (diff) | |
| parent | 620c53a664e41788f6d4f8e3f687e1a0d448b857 (diff) | |
| download | emacs-333d54dade1e7005d5a97612907158fe5ec3d310.tar.gz emacs-333d54dade1e7005d5a97612907158fe5ec3d310.tar.bz2 emacs-333d54dade1e7005d5a97612907158fe5ec3d310.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index f0f59123aa9..0dae6748c24 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -4155,6 +4155,8 @@ binding slots have been popped." (if (eq fun 'defconst) ;; `defconst' sets `var' unconditionally. (let ((tmp (make-symbol "defconst-tmp-var"))) + ;; Quote with `quote' to prevent byte-compiling the body, + ;; which would lead to an inf-loop. `(funcall '(lambda (,tmp) (defconst ,var ,tmp)) ,value)) ;; `defvar' sets `var' only when unbound. |