* lisp/emacs-lisp/cl-macs.el (cl-progv): Use a properly prefixed var name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 320da46..34fe5a5 100644 (file)
--- 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 947fa95..f22bda1 100644 (file)
--- 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 31d20f2..70d907a 100644 (file)
--- 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")))