diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-11-13 20:24:46 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-11-13 20:24:46 +0000 |
| commit | 6ff0ff686e4ad47cdc794850fcc3bd4dc89ff2b7 (patch) | |
| tree | cbb0bc0e7f3ff9dfd6399fe054124675fe5f3406 /lisp/vc.el | |
| parent | 119ff919544349f5af30d3fff06588ec6ee2fde7 (diff) | |
| download | emacs-6ff0ff686e4ad47cdc794850fcc3bd4dc89ff2b7.tar.gz | |
(vc-directory): Require dired.
(vc-revert-buffer): Ignore vc-suppress-confirm.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index d550dd4a277..b81b2990502 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1337,6 +1337,7 @@ on a buffer attached to the file named in the current Dired buffer line." Normally it creates a Dired buffer that lists only the locked files in all these directories. With a prefix argument, it lists all files." (interactive "DDired under VC (directory): \nP") + (require 'dired) (setq dirname (expand-file-name dirname)) ;; force a trailing slash (if (not (eq (elt dirname (1- (length dirname))) ?/)) @@ -1577,9 +1578,10 @@ the file on the branch you are editing." (while vc-parent-buffer (pop-to-buffer vc-parent-buffer)) (let ((file buffer-file-name) + ;; This operation should always ask for confirmation. + (vc-suppress-confirm nil) (obuf (current-buffer)) (changed (vc-diff nil t))) - (if (and changed (or vc-suppress-confirm - (not (yes-or-no-p "Discard changes? ")))) + (if (and changed (not (yes-or-no-p "Discard changes? "))) (progn (if (and (window-dedicated-p (selected-window)) (one-window-p t 'selected-frame)) |