diff options
| author | Jason Rumney <jasonr@gnu.org> | 2009-05-20 12:53:54 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2009-05-20 12:53:54 +0000 |
| commit | 41c4018353913c31310c0ee3b772cb9a260cec8f (patch) | |
| tree | b24db217b4c9ca7ddb56a4ed129741e7ef9ad7c7 | |
| parent | 4a83454db653e5ecf91a3d6d6edf6a8f1dd83319 (diff) | |
| download | emacs-41c4018353913c31310c0ee3b772cb9a260cec8f.tar.gz | |
(locate-dominating-stop-dir-regexp): Add terminal
directory separator to UNC path case (Bug#3252).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 6 insertions, 1 deletions
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 <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 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 |