[Emacs-diffs] trunk r117015: * lisp/emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge.

[Stefan Monnier]

------------------------------------------------------------
revno: 117015
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2014-04-22 21:40:35 -0400
message:
  * lisp/emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/cl-macs.el     clmacs.el-20091113204419-o5vbwnq5f7feedwu-612

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-22 21:46:19 +0000
+++ b/lisp/ChangeLog    2014-04-23 01:40:35 +0000
@@ -1,3 +1,7 @@
+2014-04-23  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge.
+
 2014-04-22  Michael Heerdegen  <address@hidden>
 
        * dired.el (dired-insert-set-properties): Do not consider

=== modified file 'lisp/emacs-lisp/cl-macs.el'
--- a/lisp/emacs-lisp/cl-macs.el        2014-04-22 21:32:51 +0000
+++ b/lisp/emacs-lisp/cl-macs.el        2014-04-23 01:40:35 +0000
@@ -1548,7 +1548,8 @@
               (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--"))