XEmacs 21.4.9 "Informed Management".

[chise/xemacs-chise.git.1] / lisp / find-paths.el

diff --git a/lisp/find-paths.el b/lisp/find-paths.el
index fdd3cc2..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
-               (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)))
@@ -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
-                                (concat base system-configuration)
+                                (paths-construct-path
+                                 (list system-configuration base))
                                 envvar default)
    (paths-find-version-directory roots
                                 base
@@ -280,7 +282,7 @@ If ENFORCE-VERSION is non-nil, the directory must contain the XEmacs version."
 
 (defun paths-decode-directory-path (string &optional drop-empties)
   "Split STRING at path separators into a directory list.
-Non-\"\" comonents are converted into directory form.
+Non-\"\" components are converted into directory form.
 If DROP-EMPTIES is non-NIL, \"\" components are dropped from the output.
 Otherwise, they are left alone."
   (let* ((components (split-path string))