From ddc13efd7096bf8cb745cd7b03b6f064747680bc Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 22 Apr 2014 21:40:35 -0400 Subject: [PATCH] * lisp/emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge. --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/cl-macs.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3caac76cb8b..1f94ba4c45a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-04-23 Stefan Monnier + + * emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge. + 2014-04-22 Michael Heerdegen * 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 c9f5f68a4d3..58c3638b58b 100644 --- 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--")) -- 2.39.5