aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-11-15 13:35:05 -0500
committerStefan Monnier2012-11-15 13:35:05 -0500
commiteb31fa401dd2163032c6d3320778008043bfde55 (patch)
tree2070613da327a521a40d8aa6f8c2820993f0370e
parent5c2a71483b029100aabf5d64717120b31f4d6fa4 (diff)
downloademacs-eb31fa401dd2163032c6d3320778008043bfde55.tar.gz
emacs-eb31fa401dd2163032c6d3320778008043bfde55.zip
* lisp/emacs-lisp/cl-macs.el (cl-flet, cl-flet*): Fix docstring.
Fixes: debbugs:12895
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/cl-macs.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74981d0c241..c84c6fe9dd2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-11-15 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/cl-macs.el (cl-flet, cl-flet*): Fix docstring (bug#12895).
4
12012-11-15 Glenn Morris <rgm@gnu.org> 52012-11-15 Glenn Morris <rgm@gnu.org>
2 6
3 * eshell/em-cmpl.el (eshell-pcomplete): New command. (Bug#12838) 7 * eshell/em-cmpl.el (eshell-pcomplete): New command. (Bug#12838)
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index b28f8f7f9e9..52188c53e6f 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1648,7 +1648,7 @@ a `let' form, except that the list of symbols can be computed at run-time."
1648 1648
1649;;;###autoload 1649;;;###autoload
1650(defmacro cl-flet (bindings &rest body) 1650(defmacro cl-flet (bindings &rest body)
1651 "Make temporary function definitions. 1651 "Make local function definitions.
1652Like `cl-labels' but the definitions are not recursive. 1652Like `cl-labels' but the definitions are not recursive.
1653 1653
1654\(fn ((FUNC ARGLIST BODY...) ...) FORM...)" 1654\(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
@@ -1672,7 +1672,7 @@ Like `cl-labels' but the definitions are not recursive.
1672 1672
1673;;;###autoload 1673;;;###autoload
1674(defmacro cl-flet* (bindings &rest body) 1674(defmacro cl-flet* (bindings &rest body)
1675 "Make temporary function definitions. 1675 "Make local function definitions.
1676Like `cl-flet' but the definitions can refer to previous ones. 1676Like `cl-flet' but the definitions can refer to previous ones.
1677 1677
1678\(fn ((FUNC ARGLIST BODY...) ...) FORM...)" 1678\(fn ((FUNC ARGLIST BODY...) ...) FORM...)"