diff options
| author | Richard M. Stallman | 1992-11-20 19:33:38 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1992-11-20 19:33:38 +0000 |
| commit | 9549c46d0b7b76c104c152e78feb33029c0e562a (patch) | |
| tree | a1d2c654c07b87939f8030f8fb1d1c99425c147e | |
| parent | c4ae7096b6ea185a527cd02cdf19d314ad2aecb6 (diff) | |
| download | emacs-9549c46d0b7b76c104c152e78feb33029c0e562a.tar.gz emacs-9549c46d0b7b76c104c152e78feb33029c0e562a.zip | |
(vc-next-action): Undo previous change.
| -rw-r--r-- | lisp/vc.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index f3d8d37d2aa..15f304dcd18 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
| 6 | ;; Version: 4.0 | 6 | ;; Version: 4.0 |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.16 1992/11/08 18:58:17 rms Exp jimb $ | 8 | ;; $Id: vc.el,v 1.17 1992/11/20 17:23:45 jimb Exp rms $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -319,7 +319,8 @@ the option to steal the lock." | |||
| 319 | (not (buffer-modified-p))) | 319 | (not (buffer-modified-p))) |
| 320 | (progn | 320 | (progn |
| 321 | (vc-backend-revert file) | 321 | (vc-backend-revert file) |
| 322 | (vc-resynch-window file t t)) | 322 | ;; DO NOT revert the file without asking the user! |
| 323 | (vc-resynch-window file t nil)) | ||
| 323 | 324 | ||
| 324 | ;; user may want to set nonstandard parameters | 325 | ;; user may want to set nonstandard parameters |
| 325 | (if verbose | 326 | (if verbose |