Fix cl-loop destructuring under `with' clause

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28b9c79079ed93dc395a2f80c3bf66eccf8e1769..cb91bbcb4d90bc52adb4e9cab8c78ecd8ec70ee5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-21  Daniel Colascione  <dancol@dancol.org>
+
+       * emacs-lisp/cl-macs.el:
+       (cl--loop-let): Properly destructure `while' clauses.
+
 2014-04-20  Daniel Colascione  <dancol@dancol.org>
 
        * vc/vc.el (vc-root-dir): New public autoloaded function for

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 5fc8c9f9a420bd555c7be98ab3d3605c590ee41e..5b9e17af23a537ee116f3797abc0153935171560 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1550,7 +1550,7 @@ 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 (and (eq body 'setq) (cl--unused-var-p temp))
+                (when (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--"))

diff --git a/test/ChangeLog b/test/ChangeLog
index 940ed0b0b917b64ab8c75b7488f359fbad6b47e0..2e6e1aefeb1bd030778768830086580906b49248 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-21  Daniel Colascione  <dancol@dancol.org>
+
+       * automated/cl-lib.el (cl-loop-destructuring-with): New test.
+
 2014-04-20  Daniel Colascione  <dancol@dancol.org>
 
        * automated/cl-lib.el (cl-lib-struct-accessors,cl-the): New tests.

diff --git a/test/automated/cl-lib.el b/test/automated/cl-lib.el
index a0df07e54eaa8c4c8ca8f9989d23654568a16470..2c73c82ba9814759882e7dfb3d041ad41ddda957 100644 (file)
--- a/test/automated/cl-lib.el
+++ b/test/automated/cl-lib.el
@@ -220,4 +220,7 @@
     (should (= (the integer (incf sideffect)) 1))
     (should (= sideffect 1))))
 
+(ert-deftest cl-loop-destructuring-with ()
+  (should (equal (cl-loop with (a b c) = '(1 2 3) return (+ a b c)) 6)))
+
 ;;; cl-lib.el ends here