X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffind-paths.el;h=494ed16e344734957f8d761771f7e98657d10383;hb=38631bba70c41d284c5d5228f40140c8551df9ae;hp=cc1620178ce51540e6c79a4674b6cea4f4a460bc;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/find-paths.el b/lisp/find-paths.el
index cc16201..494ed16 100644
--- 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