projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.2.20 "Yoko".
[chise/xemacs-chise.git]
/
lisp
/
find-paths.el
diff --git
a/lisp/find-paths.el
b/lisp/find-paths.el
index
8ecbcc1
..
9118e94
100644
(file)
--- 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)
'()
(let ((raw-entries
(if (equal 0 max-depth)
'()
- (directory-files directory nil "^[^.-]")))
+ (directory-files directory nil "^[^.-]")))
(reverse-dirs '()))
(reverse-dirs '()))
-
(while raw-entries
(if (null (string-match exclude-regexp (car raw-entries)))
(setq 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
"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"))))))
(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
(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
(concat
(file-name-as-directory root)
suffix
@@
-219,13
+218,13
@@
If ENFORCE-VERSION is non-nil, the directory must contain the XEmacs version."
;; from more to less specific
(paths-find-version-directory roots
(concat base system-configuration)
;; from more to less specific
(paths-find-version-directory roots
(concat base system-configuration)
- envvar)
+ envvar default)
(paths-find-version-directory roots
base
envvar)
(paths-find-version-directory roots
system-configuration
(paths-find-version-directory roots
base
envvar)
(paths-find-version-directory roots
system-configuration
- envvar default)))
+ envvar)))
(defun construct-emacs-version-name ()
"Construct the raw XEmacs version number."
(defun construct-emacs-version-name ()
"Construct the raw XEmacs version number."
@@
-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))
(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)))
(cons (car directories)
reverse-directories)))
(setq directories (cdr directories)))