From: Glenn Morris <rgm@gnu.org>
Date: Sat, 31 May 2014 02:27:22 +0000 (-0700)
Subject: * lisp/files.el (locate-dominating-file): Expand file argument.
X-Git-Tag: emacs-25.0.90~2612^2~709^2~831
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b5d6fe3bf6e728c82a3ff63723d75519f7853716;p=emacs.git

* lisp/files.el (locate-dominating-file): Expand file argument.

Fixes: debbugs:17641
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5e8b1dfa63..5b0affbbf2b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-31  Glenn Morris  <rgm@gnu.org>
+
+	* files.el (locate-dominating-file): Expand file argument.  (Bug#17641)
+
 2014-05-30  Glenn Morris  <rgm@gnu.org>
 
 	* loadup.el: Treat `command-line-args' more flexibly.
diff --git a/lisp/files.el b/lisp/files.el
index c153a11b243..cf54df710c2 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -883,7 +883,7 @@ which we're looking."
   ;;
   ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
   ;; `name' in /home or in /.
-  (setq file (abbreviate-file-name file))
+  (setq file (abbreviate-file-name (expand-file-name file)))
   (let ((root nil)
         ;; `user' is not initialized outside the loop because
         ;; `file' may not exist, so we may have to walk up part of the