# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1268505354 21600
# Node ID 9f2f39c806601c09a62d9a509cc8a36ab06c95fe
# Parent  186aebf7f6c60f5f619cfe37008cb17f7e4514c1# Parent  54700d784be92f947a4c68de3b1221d46c7819e2
merge

diff -r 186aebf7f6c6 -r 9f2f39c80660 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Mar 13 11:38:54 2010 -0600
+++ b/lisp/ChangeLog	Sat Mar 13 12:35:54 2010 -0600
@@ -7,6 +7,13 @@
 	equivalent functionality when an expression like (Assert (equalp ...))
 	is seen.
 
+2010-03-11  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* setup-paths.el (paths-find-emacs-roots)
+	(paths-construct-info-path):
+	Pass :from-end t to the delete-duplicates calls in these
+	functions, now the compiler macro no longer defaults it to t.
+
 2010-03-07  Ben Wing  <ben@xemacs.org>
 
 	* disp-table.el:
diff -r 186aebf7f6c6 -r 9f2f39c80660 lisp/setup-paths.el
--- a/lisp/setup-paths.el	Sat Mar 13 11:38:54 2010 -0600
+++ b/lisp/setup-paths.el	Sat Mar 13 12:35:54 2010 -0600
@@ -150,11 +150,11 @@
             (and configure-prefix-directory
                  (list (file-name-as-directory
                         configure-prefix-directory))))
-           :test #'equal))
+           :test #'equal :from-end t))
 	 (installation-roots
 	  (remove-if-not root-p potential-installation-roots)))
     (delete-duplicates (nconc invocation-roots installation-roots)
-                       :test #'equal)))
+                       :test #'equal :from-end t)))
 
 (defun paths-find-site-lisp-directory (roots)
   "Find the site Lisp directory of the XEmacs hierarchy.
@@ -281,8 +281,8 @@
             (nconc
              (paths-directories-which-exist configure-info-path)
              (paths-directories-which-exist paths-default-info-directories))
-           :test #'equal)))
-     :test #'equal)))
+           :test #'equal :from-end t)))
+     :test #'equal :from-end t)))
 
 (defun paths-find-doc-directory (roots)
   "Find the documentation directory.
diff -r 186aebf7f6c6 -r 9f2f39c80660 nt/ChangeLog
--- a/nt/ChangeLog	Sat Mar 13 11:38:54 2010 -0600
+++ b/nt/ChangeLog	Sat Mar 13 12:35:54 2010 -0600
@@ -1,3 +1,8 @@
+2010-03-08  Vin Shelton  <acs@xemacs.org>
+
+	* xemacs.mak (batch_test_emacs): The test harness no longer
+	resides in $(testdir), per Ben's changes of 2010-02-22.
+
 2010-03-02  Jerry James  <james@xemacs.org>
 
 	* xemacs.mak (INFO_FILES): Removed custom.info.
diff -r 186aebf7f6c6 -r 9f2f39c80660 nt/xemacs.mak
--- a/nt/xemacs.mak	Sat Mar 13 11:38:54 2010 -0600
+++ b/nt/xemacs.mak	Sat Mar 13 12:35:54 2010 -0600
@@ -1658,7 +1658,7 @@
 ########################### Automated tests
 
 testdir = ../tests/automated
-batch_test_emacs = $(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir)
+batch_test_emacs = $(BATCH_PACKAGES) -l test-harness -f batch-test-emacs $(testdir)
 
 check:
 	cd $(BLDSRC)