From 4250fdf5b34a9fddf6ee1cf12270d9e269c1aa6e Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 8 Aug 2012 14:56:01 -0400 Subject: [PATCH] * lisp/emacs-lisp/cl.el (cl-map-keymap-recursively, cl-map-intervals) (cl-map-extents): Add compatibility aliases. Fixes: debbugs:12135 --- lisp/ChangeLog | 31 ++++++++++++++++++------------- lisp/emacs-lisp/cl.el | 5 +++++ lisp/emacs-lisp/lisp-mode.el | 9 ++++++--- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d958c028ffd..f1039adc111 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-08-08 Stefan Monnier + + * emacs-lisp/cl.el (cl-map-keymap-recursively, cl-map-intervals) + (cl-map-extents): Add compatibility aliases (bug#12135). + 2012-08-08 Michael Albinus * net/tramp-sh.el (tramp-find-file-exists-command): Protect the @@ -62,8 +67,8 @@ * emacs-lisp/lisp-mode.el (eval-defun-1): Handle standard value of a defcustom that is quoted with backquote. - * calc/calc-prog.el (math-do-defmath): Use backquote forms. Fix - handling of interactive spec when the body uses return. + * calc/calc-prog.el (math-do-defmath): Use backquote forms. + Fix handling of interactive spec when the body uses return. (math-do-arg-check, math-define-function-body): Use backquote forms. * calc/calc-ext.el (math-defcache): Likewise. * calc/calc-rewr.el (math-rwfail, math-rweval): Likewise. @@ -75,8 +80,8 @@ * menu-bar.el (menu-bar-make-mm-toggle, menu-bar-make-toggle): Construct menu-item directly. - * progmodes/autoconf.el (font-lock-syntactic-keywords): Don't - declare. + * progmodes/autoconf.el (font-lock-syntactic-keywords): + Don't declare. 2012-08-07 Chong Yidong @@ -142,8 +147,8 @@ * proced.el (proced): Add substitution string to docstring to trigger autoloading of the proced library on C-h f (Bug#1768). - * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Don't - show defvars which have no second argument (Bug#8638). + * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): + Don't show defvars which have no second argument (Bug#8638). * imenu.el (imenu-generic-expression): Move documentation here from imenu--generic-function. @@ -221,8 +226,8 @@ * files.el (file-truename): Don't skip symlink-chasing part on windows-nt. Incorporate the resolution of 8+3 short aliases on - Windows into the loop that recursively chases symlinks. Compare - directory and its parent case-insensitively on MS-Windows and + Windows into the loop that recursively chases symlinks. + Compare directory and its parent case-insensitively on MS-Windows and MS-DOS. 2012-08-03 Chong Yidong @@ -500,7 +505,7 @@ 2012-07-27 Fabián Ezequiel Gallina - * progmodes/python.el (python-mode-map): Added keybinding for + * progmodes/python.el (python-mode-map): Add keybinding for run-python. (python-shell-make-comint): Fix pop-to-buffer call. (run-python): Autoload. New arg SHOW. @@ -516,8 +521,8 @@ 2012-07-27 Tassilo Horn - * textmodes/reftex-vars.el (reftex-label-alist-builtin): Add - support for the lstlisting and minted environments, and for the + * textmodes/reftex-vars.el (reftex-label-alist-builtin): + Add support for the lstlisting and minted environments, and for the ctable macro. * textmodes/reftex.el (reftex-compile-variables): Also recognize labels written in keyvals syntax. @@ -532,8 +537,8 @@ * makefile.w32-in ($(lisp)/calendar/cal-loaddefs.el) ($(lisp)/calendar/diary-loaddefs.el) ($(lisp)/calendar/hol-loaddefs.el, $(lisp)/mh-e/mh-loaddefs.el) - ($(lisp)/net/tramp-loaddefs.el): Depend on update-subdirs. Fixes - failures in parallel bootstrap because subdirs.el is being + ($(lisp)/net/tramp-loaddefs.el): Depend on update-subdirs. + Fixes failures in parallel bootstrap because subdirs.el is being rewritten while the autoload files are built at the same time, which needs to load subdirs.el. 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)