diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index 8174de786c7..c9ed9efe0c5 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -686,6 +686,11 @@ from ARGLIST using FUNC: (define-modify-macro incf (&optional (n 1)) +)" (define-obsolete-function-alias 'cl-hash-table-p 'hash-table-p "24.2") (define-obsolete-function-alias 'cl-hash-table-count 'hash-table-count "24.2") +(define-obsolete-function-alias 'cl-map-keymap-recursively + 'cl--map-keymap-recursively "24.2") +(define-obsolete-function-alias 'cl-map-intervals 'cl--map-intervals "24.2") +(define-obsolete-function-alias 'cl-map-extents 'cl--map-overlays "24.2") + (defun cl-maclisp-member (item list) (declare (obsolete member "24.2")) (while (and list (not (equal item (car list)))) (setq list (cdr list))) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 99677551a47..666e31f690f 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) |