summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-macs.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-02-04 11:40:12 +0000
committerAndrea Corallo <akrl@sdf.org>2020-02-04 15:11:20 +0100
commit15aedf3e3d7814aff980098f9290396222c0ff8d (patch)
tree1a3b1287cc72b7ecb2703761ad03dfc75f4dbe2e /lisp/emacs-lisp/cl-macs.el
parentea56b58098d78b242bc0c51cf1d8b1d21962c130 (diff)
parentb641c178ce3d022a9fca1d44ecb60f3878a989bd (diff)
downloademacs-15aedf3e3d7814aff980098f9290396222c0ff8d.tar.gz
emacs-15aedf3e3d7814aff980098f9290396222c0ff8d.tar.bz2
emacs-15aedf3e3d7814aff980098f9290396222c0ff8d.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/cl-macs.el')
-rw-r--r--lisp/emacs-lisp/cl-macs.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index c4f69120ff7..9d0fd15bc3d 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1318,7 +1318,10 @@ For more details, see Info node `(cl)Loop Facility'.
(nreverse cl--loop-conditions)))
,then ,var))
loop-for-steps))
- (push `(,var (if ,first-assign ,start ,then)) loop-for-sets))))
+ (push (if (eq start then)
+ `(,var ,then)
+ `(,var (if ,first-assign ,start ,then)))
+ loop-for-sets))))
((memq word '(across across-ref))
(let ((temp-vec (make-symbol "--cl-vec--"))