(locate-dominating-stop-dir-regexp): Add terminal

directory separator to UNC path case (Bug#3252).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4445dd3461f8a84a4aab9c3dae05b53c8c809f43..ac91f3f3f105352ce8949682ce612457eced1352 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-20  Jason Rumney  <jasonr@gnu.org>
+
+       * files.el (locate-dominating-stop-dir-regexp): Add terminal
+       directory separator to UNC path case (Bug#3252).
+
 2009-05-20  Chong Yidong  <cyd@stupidchicken.com>
 
        * international/encoded-kb.el (encoded-kbd-setup-display): Change

diff --git a/lisp/files.el b/lisp/files.el
index 7b7c438df3cc2302fa057ec359ab4de8957f20c9..4e81b6ad52d54d579dec0b25bbf4b046dfad897e 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -742,7 +742,7 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
 (make-obsolete 'locate-file-completion 'locate-file-completion-table "23.1")
 
 (defvar locate-dominating-stop-dir-regexp
-  "\\`\\(?:[\\/][\\/][^\\/]+\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'"
+  "\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'"
   "Regexp of directory names which stop the search in `locate-dominating-file'.
 Any directory whose name matches this regexp will be treated like
 a kind of root directory by `locate-dominating-file' which will stop its search