aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-15 16:59:42 +0200
committerLars Magne Ingebrigtsen2011-07-15 16:59:42 +0200
commitc39da69053fc7bd17a3859dc56a9cd0991961999 (patch)
tree55a8c6e73e37b3f7d1dd87bb92935520313ca93a
parentf863868c450935385e5483c2e170fa7eb5799327 (diff)
downloademacs-c39da69053fc7bd17a3859dc56a9cd0991961999.tar.gz
emacs-c39da69053fc7bd17a3859dc56a9cd0991961999.zip
* emacs-lisp/cl-macs.el (declare): Doc string fix-up.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/cl-macs.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f32e44beb2..1ec6c18e6a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * emacs-lisp/cl-macs.el (declare): Doc string fix-up.
4
3 * international/mule-cmds.el 5 * international/mule-cmds.el
4 (describe-specified-language-support): Make the error message 6 (describe-specified-language-support): Make the error message
5 clearer (bug#8905). 7 clearer (bug#8905).
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 623d1c6418f..4f9e0e8b70a 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1601,12 +1601,12 @@ values. For compatibility, (values A B C) is a synonym for (list A B C).
1601 1601
1602;;;###autoload 1602;;;###autoload
1603(defmacro declare (&rest specs) 1603(defmacro declare (&rest specs)
1604 "Declare something about SPECS while compiling. 1604 "Declare SPECS about the current function while compiling.
1605For instance 1605For instance
1606 1606
1607 \(declare (warn 0)) 1607 \(declare (warn 0))
1608 1608
1609will turn off byte-compile warnings." 1609will turn off byte-compile warnings in the function."
1610 (if (cl-compiling-file) 1610 (if (cl-compiling-file)
1611 (while specs 1611 (while specs
1612 (if (listp cl-declare-stack) (push (car specs) cl-declare-stack)) 1612 (if (listp cl-declare-stack) (push (car specs) cl-declare-stack))