diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22f561f8ef8..3c53662600a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-01-09 Juanma Barranquero <lekktu@gmail.com> + + * vc-bzr.el (vc-bzr-working-revision): On Windows and MS-DOS, accept + URLs with a leading triple slash in the file: scheme. (Bug#5345) + 2010-01-09 Chong Yidong <cyd@stupidchicken.com> * progmodes/compile.el: Don't treat compile-command as safe if diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index f140671be12..a16e0889b74 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -361,6 +361,11 @@ If any error occurred in running `bzr status', then return nil." ;; look there for the version information. (when (re-search-forward "file://\\(.+\\)" nil t) (let ((l-c-parent-dir (match-string 1))) + (when (and (memq system-type '(ms-dos windows-nt)) + (string-match-p "^/[[:alpha:]]:" l-c-parent-dir)) + ;;; On Windows, file:// URLs often have three slashes, + ;;; so we must remove the remaining one (bug#5345) + (setq l-c-parent-dir (substring l-c-parent-dir 1))) (setq branch-format-file (expand-file-name vc-bzr-admin-branch-format-file l-c-parent-dir)) |