* lisp/emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3caac76cb8bc6314860fb74213ad06b0d60bb5e9..1f94ba4c45a9ccf03ac495b44889f988bb36d66f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge.
+
 2014-04-22  Michael Heerdegen  <michael_heerdegen@web.de>
 
        * dired.el (dired-insert-set-properties): Do not consider

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index c9f5f68a4d356c7643a80a56b5bf91586afa679b..58c3638b58bd1f1f87b3058942fcfa8cbbe25d78 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1548,7 +1548,8 @@ If BODY is `setq', then use SPECS for assignments rather than for bindings."
               (if (and (cl--unused-var-p temp) (null expr))
                   nil ;; Don't bother declaring/setting `temp' since it won't
                      ;; be used when `expr' is nil, anyway.
-               (when (or (null temp) (cl--unused-var-p temp))
+               (when (or (null temp)
+                          (and (eq body 'setq) (cl--unused-var-p temp)))
                   ;; Prefer a fresh uninterned symbol over "_to", to avoid
                   ;; warnings that we set an unused variable.
                   (setq temp (make-symbol "--cl-var--"))