mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-07 15:00:34 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

Browse source
This commit is contained in:
Paul Eggert 2014-04-22 14:32:51 -07:00
commit 42e910349d
60 changed files with 1841 additions and 762 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/cl-macs.el
View file

@ -1548,12 +1548,13 @@ 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 (cl--unused-var-p temp)
(when (or (null temp) (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--"))
;; Make sure this temp variable is locally declared.
(push (list (list temp)) cl--loop-bindings))
(when (eq body 'setq)
(push (list (list temp)) cl--loop-bindings)))
(push (list temp expr) new))
(while (consp spec)
(push (list (pop spec)