From: Michael Olson <mwolson@gnu.org>
Date: Tue, 20 May 2008 03:15:16 +0000 (+0000)
Subject: files.el (project-find-settings-file): Change concat to expand-file-name.
X-Git-Tag: emacs-pretest-23.0.90~5423
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=360a13492ad3432dd921af3142cde39033ce4d09;p=emacs.git

files.el (project-find-settings-file): Change concat to expand-file-name.
---

diff --git a/lisp/files.el b/lisp/files.el
index 35c21b19da5..ee5efe45627 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3127,8 +3127,8 @@ Otherwise this returns nil."
        ((setq result (assoc dir project-directory-alist))
 	;; Nothing else.
 	nil)
-       ((file-exists-p (concat dir ".dir-settings.el"))
-	(setq result (concat dir ".dir-settings.el")))
+       ((file-exists-p (expand-file-name ".dir-settings.el" dir))
+	(setq result (expand-file-name ".dir-settings.el" dir)))
        (t
 	(setq dir (file-name-directory (directory-file-name dir))))))
     result))