Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
1560:c69c3868eeeb 1561:6f4c71266175
171 ;; First, check the environment var. 171 ;; First, check the environment var.
172 (if env-value 172 (if env-value
173 (let ((path-list (paths-decode-directory-path env-value 'drop-empties))) 173 (let ((path-list (paths-decode-directory-path env-value 'drop-empties)))
174 (cond ((eq type 'std) 174 (cond ((eq type 'std)
175 (while path-list 175 (while path-list
176 (if (equal (substring (car path-list) -16) 176 (if (equal (file-name-nondirectory
177 (concat "xemacs-packages" (char-to-string directory-sep-char))) 177 (directory-file-name (car path-list)))
178 "xemacs-packages")
178 (setq top-dir (car path-list))) 179 (setq top-dir (car path-list)))
179 (setq path-list (cdr path-list)))) 180 (setq path-list (cdr path-list))))
180 ((eq type 'mule) 181 ((eq type 'mule)
181 (while path-list 182 (while path-list
182 (if (equal (substring (car path-list) -14) 183 (if (equal (file-name-nondirectory
183 (concat "mule-packages" (char-to-string directory-sep-char))) 184 (directory-file-name (car path-list)))
185 "mule-packages")
184 (setq top-dir (car path-list))) 186 (setq top-dir (car path-list)))
185 (setq path-list (cdr path-list))))))) 187 (setq path-list (cdr path-list)))))))
186 ;; Wasn't in the environment, try `user-init-directory' if 188 ;; Wasn't in the environment, try `user-init-directory' if
187 ;; USER-DIR is non-nil. 189 ;; USER-DIR is non-nil.
188 (if (and user-dir 190 (if (and user-dir