From: Jason Rumney Date: Wed, 20 May 2009 12:53:54 +0000 (+0000) Subject: (locate-dominating-stop-dir-regexp): Add terminal X-Git-Tag: emacs-pretest-23.0.94~12 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41c4018353913c31310c0ee3b772cb9a260cec8f;p=emacs.git (locate-dominating-stop-dir-regexp): Add terminal directory separator to UNC path case (Bug#3252). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4445dd3461f..ac91f3f3f10 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-05-20 Jason Rumney + + * files.el (locate-dominating-stop-dir-regexp): Add terminal + directory separator to UNC path case (Bug#3252). + 2009-05-20 Chong Yidong * international/encoded-kb.el (encoded-kbd-setup-display): Change diff --git a/lisp/files.el b/lisp/files.el index 7b7c438df3c..4e81b6ad52d 100644 --- 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