changeset 103266:3b62b3b15bfe

(locate-dominating-stop-dir-regexp): Add terminal directory separator to UNC path case (Bug#3252).
author Jason Rumney <jasonr@gnu.org>
date Wed, 20 May 2009 12:53:54 +0000
parents bed597fb4bad
children 713705a2957d
files lisp/ChangeLog lisp/files.el
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed May 20 02:57:15 2009 +0000
+++ b/lisp/ChangeLog	Wed May 20 12:53:54 2009 +0000
@@ -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
--- a/lisp/files.el	Wed May 20 02:57:15 2009 +0000
+++ b/lisp/files.el	Wed May 20 12:53:54 2009 +0000
@@ -742,7 +742,7 @@
 (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