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

Fixes: debbugs:17641

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5e8b1dfa639f8ff59a44d490a520c9ad4596b86..5b0affbbf2b399c862c119b6f72b8acb425e86b4 100644 (file)
--- 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 c153a11b24358a6a12f71e856b783f3ff21e4346..cf54df710c2034da6308e88bc599aa27fe70f3ed 100644 (file)
--- 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