diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-06-27 21:42:16 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-06-27 21:42:16 +0100 |
| commit | 0eedb5af0b9f505dda9418323c74e992a40e5585 (patch) | |
| tree | 9ef1315ecb577c36b062e8b3cb7a7c1bed6fd426 /lisp/vc/vc-dir.el | |
| parent | 24f68d6bfc83b5514d928853ffd86b97c53e1623 (diff) | |
| parent | 118c07e02e939c9f52688091509d4bff2a897032 (diff) | |
| download | emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.tar.gz emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.tar.bz2 emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/vc/vc-dir.el')
| -rw-r--r-- | lisp/vc/vc-dir.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index a86c37c24ae..46be9b73801 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -1366,7 +1366,7 @@ These are the commands available for use in the file status buffer: ;; Otherwise if you do C-x v d -> C-x C-f -> C-x v d ;; you may get a new *vc-dir* buffer, different from the original (file-truename (read-directory-name "VC status for directory: " - (vc-root-dir) nil t + (vc-root-dir) (vc-known-roots) t nil)) (if current-prefix-arg (intern @@ -1496,8 +1496,9 @@ This implements the `bookmark-make-record-function' type for This implements the `handler' function interface for the record type returned by `vc-dir-bookmark-make-record'." (let* ((file (bookmark-prop-get bmk 'filename)) - (buf (save-window-excursion - (vc-dir file) (current-buffer)))) + (buf (progn ;; Don't use save-window-excursion (bug#39722) + (vc-dir file) + (current-buffer)))) (bookmark-default-handler `("" (buffer . ,buf) . ,(bookmark-get-bookmark-record bmk))))) |