From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 19 Sep 2002 18:57:55 +0000 (+0000)
Subject: (custom-make-dependencies): Fix previous change.
X-Git-Tag: ttn-vms-21-2-B4~13107
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4986d1f19bfa64532a9e0c07be43f3c13c167687;p=emacs.git

(custom-make-dependencies): Fix previous change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15a7d3c6979..1730550dc9b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-19  Richard M. Stallman  <rms@gnu.org>
+
+	* cus-dep.el (custom-make-dependencies): Fix previous change.
+
 2002-09-19  Juanma Barranquero  <lektu@terra.es>
 
 	* ielm.el (ielm-eval-input): Call `error-message-string' instead
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 9156bcec3bf..a73569203ab 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -87,7 +87,17 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
 		    item where found)
 		(when members
 		  ;; So x and no-x builds won't differ.
-		  (setq members (sort (copy-sequence members) 'string<))
+		  (setq members
+			(sort (copy-sequence members) 
+			      (lambda (x y)
+				(cond ((and (stringp x) (stringp y))
+				       (string< x y))
+				      ;; Put all non-strings before strings.
+				      ((stringp y) t)
+				      ((stringp x) nil)
+				      ;; For two non-strings,
+				      ;; use the order they appear in MEMBERS.
+				      (t (member y (member x members)))))))
 		  (while members
 		    (setq item (car (car members))
 			  members (cdr members)