aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/emacs-lisp/lisp-mode.el
diff options
context:
space:
mode:
authorStefan Monnier <[email protected]>2012-08-08 14:56:01 -0400
committerStefan Monnier <[email protected]>2012-08-08 14:56:01 -0400
commit4250fdf5b34a9fddf6ee1cf12270d9e269c1aa6e (patch)
tree22c8e124af42080b6bfab100b95a0441fa457c79 /lisp/emacs-lisp/lisp-mode.el
parentda3d210583cd7a9a22ca6a2d07cac5bbf6fca7c1 (diff)
* lisp/emacs-lisp/cl.el (cl-map-keymap-recursively, cl-map-intervals)
(cl-map-extents): Add compatibility aliases. Fixes: debbugs:12135
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 99677551a4..666e31f690 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -776,9 +776,12 @@ Reinitialize the face according to the `defface' specification."
(default-boundp (eval (nth 1 form) lexical-binding)))
;; Force variable to be bound.
(set-default (eval (nth 1 form) lexical-binding)
- ;; The value may be quoted with quote or backquote.
- (eval (eval (nth 2 form) lexical-binding)
- lexical-binding))
+ ;; The second arg is an expression that evaluates to
+ ;; an expression. The second evaluation is the one
+ ;; normally performed not be normal execution but by
+ ;; custom-initialize-set (for example), which does not
+ ;; use lexical-binding.
+ (eval (eval (nth 2 form) lexical-binding)))
form)
;; `defface' is macroexpanded to `custom-declare-face'.
((eq (car form) 'custom-declare-face)