projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(U+52C9): Unify JU+FA33.
[chise/xemacs-chise.git-]
/
lisp
/
find-paths.el
diff --git
a/lisp/find-paths.el
b/lisp/find-paths.el
index
cc16201
..
494ed16
100644
(file)
--- a/
lisp/find-paths.el
+++ b/
lisp/find-paths.el
@@
-69,7
+69,8
@@
from the search."
(directory-files directory nil "^[^.-]")))
(reverse-dirs '()))
(while raw-entries
(directory-files directory nil "^[^.-]")))
(reverse-dirs '()))
(while raw-entries
- (if (null (string-match exclude-regexp (car raw-entries)))
+ (if (not (and exclude-regexp
+ (string-match exclude-regexp (car raw-entries))))
(setq reverse-dirs
(cons (expand-file-name (car raw-entries) directory)
reverse-dirs)))
(setq reverse-dirs
(cons (expand-file-name (car raw-entries) directory)
reverse-dirs)))
@@
-235,7
+236,8
@@
If ENFORCE-VERSION is non-nil, the directory must contain the XEmacs version."
(or
;; from more to less specific
(paths-find-version-directory roots
(or
;; from more to less specific
(paths-find-version-directory roots
- (concat base system-configuration)
+ (paths-construct-path
+ (list system-configuration base))
envvar default)
(paths-find-version-directory roots
base
envvar default)
(paths-find-version-directory roots
base