Mercurial > hg > xemacs-beta
comparison lisp/setup-paths.el @ 5115:54700d784be9
Correct the #'delete-duplicates calls, setup-paths.el
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.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 11 Mar 2010 15:41:10 +0000 |
parents | 6b6b0f8ab749 |
children | 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
5114:85b327aa1b47 | 5115:54700d784be9 |
---|---|
148 (list (file-name-as-directory | 148 (list (file-name-as-directory |
149 configure-exec-prefix-directory))) | 149 configure-exec-prefix-directory))) |
150 (and configure-prefix-directory | 150 (and configure-prefix-directory |
151 (list (file-name-as-directory | 151 (list (file-name-as-directory |
152 configure-prefix-directory)))) | 152 configure-prefix-directory)))) |
153 :test #'equal)) | 153 :test #'equal :from-end t)) |
154 (installation-roots | 154 (installation-roots |
155 (remove-if-not root-p potential-installation-roots))) | 155 (remove-if-not root-p potential-installation-roots))) |
156 (delete-duplicates (nconc invocation-roots installation-roots) | 156 (delete-duplicates (nconc invocation-roots installation-roots) |
157 :test #'equal))) | 157 :test #'equal :from-end t))) |
158 | 158 |
159 (defun paths-find-site-lisp-directory (roots) | 159 (defun paths-find-site-lisp-directory (roots) |
160 "Find the site Lisp directory of the XEmacs hierarchy. | 160 "Find the site Lisp directory of the XEmacs hierarchy. |
161 ROOTS is a list of installation roots." | 161 ROOTS is a list of installation roots." |
162 (paths-find-site-directory roots (list "site-lisp") | 162 (paths-find-site-directory roots (list "site-lisp") |
279 (and (null info-path-envval) | 279 (and (null info-path-envval) |
280 (delete-duplicates | 280 (delete-duplicates |
281 (nconc | 281 (nconc |
282 (paths-directories-which-exist configure-info-path) | 282 (paths-directories-which-exist configure-info-path) |
283 (paths-directories-which-exist paths-default-info-directories)) | 283 (paths-directories-which-exist paths-default-info-directories)) |
284 :test #'equal))) | 284 :test #'equal :from-end t))) |
285 :test #'equal))) | 285 :test #'equal :from-end t))) |
286 | 286 |
287 (defun paths-find-doc-directory (roots) | 287 (defun paths-find-doc-directory (roots) |
288 "Find the documentation directory. | 288 "Find the documentation directory. |
289 ROOTS is the list of installation roots." | 289 ROOTS is the list of installation roots." |
290 (paths-find-architecture-directory roots (list "lib-src") nil configure-doc-directory)) | 290 (paths-find-architecture-directory roots (list "lib-src") nil configure-doc-directory)) |