summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/cl.el2
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 @@
+2012-07-13 Andreas Schwab <schwab@linux-m68k.org>
+
+ * emacs-lisp/cl.el (labels): Remove spurious quote. (Bug#11938)
+
2012-07-13 Juanma Barranquero <lekktu@gmail.com>
* 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))))
"Make temporary function bindings.
Like `cl-labels' except that the lexical scoping is handled via `lexical-let'
rather than relying on `lexical-binding'."
- (declare (indent 1) (debug cl-flet) (obsolete 'cl-labels "24.2"))
+ (declare (indent 1) (debug cl-flet) (obsolete cl-labels "24.2"))
(let ((vars nil) (sets nil) (newenv macroexpand-all-environment))
(dolist (binding bindings)
;; It's important that (not (eq (symbol-name var1) (symbol-name var2)))