diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-30 22:45:07 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-30 22:45:07 -0700 |
| commit | 86f3178890f56cb408949e125d5d99e3124dd48f (patch) | |
| tree | a2c5f15751bbfe701d2f0da6fab0e0ea1fefc8ce /lisp/emacs-lisp | |
| parent | 12c69b84d1ab93d5b0bd189394952da12340f86d (diff) | |
| parent | b9627cfb1d5b5b0914525a19cd9edb06f91a1665 (diff) | |
| download | emacs-86f3178890f56cb408949e125d5d99e3124dd48f.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp')
| -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. |