Mercurial > hg > xemacs-beta

diff lisp/package-admin.el @ 1561:6f4c71266175

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-07-05 08:40:36 by adrian] xemacs-21.5: package installation fixes -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2003-07-05 Adrian Aichner <adrian@xemacs.org> * package-admin.el (package-admin-find-top-directory): Simplify directory comparisions and fix substring errors on short path components. * package-get.el (package-get-package-index-file-location): Default to first component of "EMACSPACKAGEPATH", if set.
author adrian
date Sat, 05 Jul 2003 08:40:37 +0000
parents a939d086aa0f
children f4e405a9d18d
line wrap: on
line diff
--- a/lisp/package-admin.el	Fri Jul 04 21:52:20 2003 +0000
+++ b/lisp/package-admin.el	Sat Jul 05 08:40:37 2003 +0000
@@ -173,14 +173,16 @@
 	(let ((path-list (paths-decode-directory-path env-value 'drop-empties)))
 	  (cond ((eq type 'std)
 		 (while path-list
-		   (if (equal (substring (car path-list) -16) 
-			      (concat "xemacs-packages" (char-to-string directory-sep-char)))
+		   (if (equal (file-name-nondirectory 
+			       (directory-file-name (car path-list)))
+			      "xemacs-packages")
 		       (setq top-dir (car path-list)))
 		   (setq path-list (cdr path-list))))
 		((eq type 'mule)
 		 (while path-list
-		   (if (equal (substring (car path-list) -14) 
-			      (concat "mule-packages" (char-to-string directory-sep-char)))
+		   (if (equal (file-name-nondirectory 
+			       (directory-file-name (car path-list)))
+			      "mule-packages")
 		       (setq top-dir (car path-list)))
 		   (setq path-list (cdr path-list)))))))
     ;; Wasn't in the environment, try `user-init-directory' if