diff options
| author | Andreas Schwab | 2012-07-13 20:15:22 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-07-13 20:15:22 +0200 |
| commit | 7f5b319886fac0bf379dada4a8c2cbd8dc4fe3c7 (patch) | |
| tree | 288882608884041498d2e51b3c96085f1bf8d74f /lisp | |
| parent | 0dc8cf5002ba3f79bf840de5b83c0f4f2e4e6279 (diff) | |
| download | emacs-7f5b319886fac0bf379dada4a8c2cbd8dc4fe3c7.tar.gz emacs-7f5b319886fac0bf379dada4a8c2cbd8dc4fe3c7.zip | |
Fixes: debbugs:11938
* emacs-lisp/cl.el (labels): Remove spurious quote.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d5c4fd61cc..1f44136f839 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-07-13 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * emacs-lisp/cl.el (labels): Remove spurious quote. (Bug#11938) | ||
| 4 | |||
| 1 | 2012-07-13 Juanma Barranquero <lekktu@gmail.com> | 5 | 2012-07-13 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * bindings.el (top): Use `mapc' instead of `mapcar'. | 7 | * bindings.el (top): Use `mapc' instead of `mapcar'. |
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index e1e40029491..32cf1670744 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el | |||
| @@ -489,7 +489,7 @@ will not work - use `labels' instead" (symbol-name (car x)))) | |||
| 489 | "Make temporary function bindings. | 489 | "Make temporary function bindings. |
| 490 | Like `cl-labels' except that the lexical scoping is handled via `lexical-let' | 490 | Like `cl-labels' except that the lexical scoping is handled via `lexical-let' |
| 491 | rather than relying on `lexical-binding'." | 491 | rather than relying on `lexical-binding'." |
| 492 | (declare (indent 1) (debug cl-flet) (obsolete 'cl-labels "24.2")) | 492 | (declare (indent 1) (debug cl-flet) (obsolete cl-labels "24.2")) |
| 493 | (let ((vars nil) (sets nil) (newenv macroexpand-all-environment)) | 493 | (let ((vars nil) (sets nil) (newenv macroexpand-all-environment)) |
| 494 | (dolist (binding bindings) | 494 | (dolist (binding bindings) |
| 495 | ;; It's important that (not (eq (symbol-name var1) (symbol-name var2))) | 495 | ;; It's important that (not (eq (symbol-name var1) (symbol-name var2))) |