carbon2-commit: Avoid the query-coding-tests.el hang, by fixing a logic bug.

[Aidan Kehoe]

changeset:   5149:a24f2ab0093b
user:        Aidan Kehoe <kehoea at parhasard.net>
date:        Fri Mar 05 15:11:52 2010 +0000
files:       lisp/ChangeLog lisp/cl-macs.el
description:
Avoid the query-coding-tests.el hang, by fixing a logic bug.

2010-03-05  Aidan Kehoe  <kehoea at parhasard.net>

	* cl-macs.el (delete-duplicates):
	Correct the logic of this compiler macro when :from-end is nil,
	avoiding a hang in query-coding-tests.el. Thanks for the reports,
	Vin and Mats!


diff -r e402e3506a53 -r a24f2ab0093b lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Mar 04 16:47:16 2010 +0000
+++ b/lisp/ChangeLog	Fri Mar 05 15:11:52 2010 +0000
@@ -1,3 +1,10 @@
+2010-03-05  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* cl-macs.el (delete-duplicates):
+	Correct the logic of this compiler macro when :from-end is nil,
+	avoiding a hang in query-coding-tests.el. Thanks for the reports,
+	Vin and Mats!
+
 2010-03-04  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* make-docfile.el (process-args):
diff -r e402e3506a53 -r a24f2ab0093b lisp/cl-macs.el
--- a/lisp/cl-macs.el	Thu Mar 04 16:47:16 2010 +0000
+++ b/lisp/cl-macs.el	Fri Mar 05 15:11:52 2010 +0000
@@ -3331,8 +3331,8 @@
                    (setq cl-seq begin)
                    (while (cddr cl-seq)
                      (if (memq (cadr cl-seq) (cddr cl-seq))
-                         (setcdr (cdr cl-seq) (cddr cl-seq))
-                       (setq cl-seq (cdr cl-seq))))
+                         (setcdr (cdr cl-seq) (cddr cl-seq)))
+                     (setq cl-seq (cdr cl-seq)))
                    begin)
                ;; Call cl-delete-duplicates explicitly, to avoid the form
                ;; getting compiler-macroexpanded again: