# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1267833096 21600
# Node ID 4129013a395471f1d5067fb8ada689fac775df5d
# Parent  ec6e767f8fc59decadd752d8ae75f9e730f1314f# Parent  a24f2ab0093bb8bf6278535e46155e58fac634be
merge

diff -r ec6e767f8fc5 -r 4129013a3954 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Mar 05 07:20:26 2010 -0600
+++ b/lisp/ChangeLog	Fri Mar 05 17:51:36 2010 -0600
@@ -1,3 +1,16 @@
+2010-03-05  Aidan Kehoe  <kehoea@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@parhasard.net>
+
+	* make-docfile.el (process-args):
+	Use #'subseq here, not #'substring, fixing the native Windows
+	build. Thank you for the error report, Vin!
+
 2010-03-03  Aidan Kehoe  <kehoea@parhasard.net>
 
 	Move byte code #o117 to #'subseq, not #'substring.
diff -r ec6e767f8fc5 -r 4129013a3954 lisp/cl-macs.el
--- a/lisp/cl-macs.el	Fri Mar 05 07:20:26 2010 -0600
+++ b/lisp/cl-macs.el	Fri Mar 05 17:51:36 2010 -0600
@@ -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:
diff -r ec6e767f8fc5 -r 4129013a3954 lisp/make-docfile.el
--- a/lisp/make-docfile.el	Fri Mar 05 07:20:26 2010 -0600
+++ b/lisp/make-docfile.el	Fri Mar 05 17:51:36 2010 -0600
@@ -92,7 +92,7 @@
 	  ;; no generate-new-buffer so use its implementation.
 	  (let ((buf (get-buffer-create (generate-new-buffer-name "foo"))))
 	    (set-buffer buf)
-	    (insert-file-contents-internal (substring arg 1))
+	    (insert-file-contents-internal (subseq arg 1))
 	    ;; now majorly grind up the response file.
 	    ;; backslashes get doubled, quotes around strings,
 	    ;; get rid of pesky CR's and NL's, and put parens around
@@ -123,8 +123,7 @@
 		       (concat 
 			(file-name-nondirectory
 			 ;; no match-string so use its implementation.
-			 (substring arg (match-beginning 1)
-				    (match-end 1)))
+			 (subseq arg (match-beginning 1) (match-end 1)))
 			".c")
 		       source-src)))
 	  (if (and (null docfile-out-of-date)