X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffind-paths.el;h=f5be62429e6f46a249e84b9c1d4a75f93a99cb91;hb=2cf9f4bc6edb561e2bd9a7016f22c8e1b479da8e;hp=8ecbcc1d04f7379fa48dd2eb44e670b20314ab9f;hpb=72a705551741d6f85a40eea486c222bac482d8dc;p=chise%2Fxemacs-chise.git diff --git a/lisp/find-paths.el b/lisp/find-paths.el index 8ecbcc1..f5be624 100644 --- a/lisp/find-paths.el +++ b/lisp/find-paths.el @@ -66,9 +66,8 @@ from the search." (let ((raw-entries (if (equal 0 max-depth) '() - (directory-files directory nil "^[^.-]"))) + (directory-files directory nil "^[^.-]"))) (reverse-dirs '())) - (while raw-entries (if (null (string-match exclude-regexp (car raw-entries))) (setq reverse-dirs @@ -106,7 +105,7 @@ from the search." "lib" emacs-program-name))) ;; in-place or windows-nt - (and + (and (paths-file-readable-directory-p (paths-construct-path (list directory "lisp"))) (paths-file-readable-directory-p (paths-construct-path (list directory "etc")))))) @@ -153,7 +152,7 @@ to EXPAND-FILE-NAME." (defun paths-construct-emacs-directory (root suffix base) "Construct a directory name within the XEmacs hierarchy." (file-name-as-directory - (expand-file-name + (expand-file-name (concat (file-name-as-directory root) suffix @@ -236,7 +235,7 @@ If ENFORCE-VERSION is non-nil, the directory must contain the XEmacs version." (let ((reverse-directories '())) (while directories (if (paths-file-readable-directory-p (car directories)) - (setq reverse-directories + (setq reverse-directories (cons (car directories) reverse-directories))) (setq directories (cdr directories)))