summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-07-17 08:58:25 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-07-17 08:58:25 -0400
commit88ecaf8fa55e7bd0a76c9ea0bda93dbc063f3036 (patch)
tree05ecdd9809aac60f7e3b776058526f9d4f023d80 /lisp
parentef501ef01cd3d3168da15cf5426f1be119fc90c8 (diff)
downloademacs-88ecaf8fa55e7bd0a76c9ea0bda93dbc063f3036.tar.gz
* lisp/emacs-lisp/cl-macs.el (cl-progv): Use a properly prefixed var name.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/emacs-lisp/cl-loaddefs.el2
-rw-r--r--lisp/emacs-lisp/cl-macs.el2
3 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 320da46f186..34fe5a509f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,13 @@
2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca>
+ * emacs-lisp/cl-macs.el (cl-progv): Use a properly prefixed var name.
+
* emacs-lisp/elint.el (elint-find-args-in-code):
Use help-function-arglist, so as to handle lexical byte-code.
* progmodes/sh-script.el (sh-syntax-propertize-function): Fix last
change (bug#11826).
-2012-07-17 Glenn Morris <rgm@gnu.org>
2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/cc-engine.el (c-forward-sws, c-backward-sws):
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 947fa9513bb..f22bda1559a 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -260,7 +260,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
;;;;;; cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase
;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
-;;;;;; cl-gensym) "cl-macs" "cl-macs.el" "a175c7714223c21a617b0460e130f1d8")
+;;;;;; cl-gensym) "cl-macs" "cl-macs.el" "6b06545d8d17e8b902435f08be6ac0c2")
;;; Generated autoloads from cl-macs.el
(autoload 'cl-gensym "cl-macs" "\
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 31d20f274ed..70d907a14c1 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1547,7 +1547,7 @@ second list (or made unbound if VALUES is shorter than SYMBOLS); then the
BODY forms are executed and their result is returned. This is much like
a `let' form, except that the list of symbols can be computed at run-time."
(declare (indent 2) (debug (form form body)))
- (let ((bodyfun (make-symbol "body"))
+ (let ((bodyfun (make-symbol "cl--progv-body"))
(binds (make-symbol "binds"))
(syms (make-symbol "syms"))
(vals (make-symbol "vals")))