diff options
| author | Stefan Monnier | 2015-10-28 14:00:24 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2015-10-28 14:00:24 -0400 |
| commit | dfa2e4a6e6cbf64df9031858c473b0e0ab1a00d3 (patch) | |
| tree | 9b06952d0923a4f37a8e07480a804adf39684234 | |
| parent | d5ee655c1710a62e01513fd20256a7cf35d52167 (diff) | |
| download | emacs-dfa2e4a6e6cbf64df9031858c473b0e0ab1a00d3.tar.gz emacs-dfa2e4a6e6cbf64df9031858c473b0e0ab1a00d3.zip | |
* lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state.
| -rw-r--r-- | lisp/vc/pcvs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index f6a9e08d84b..3fdee100d44 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el | |||
| @@ -2312,7 +2312,7 @@ this file, or a list of arguments to send to the program." | |||
| 2312 | (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) | 2312 | (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) |
| 2313 | ;; `preserve-modes' avoids changing the (minor) modes. But we | 2313 | ;; `preserve-modes' avoids changing the (minor) modes. But we |
| 2314 | ;; do want to reset the mode for VC, so we do it explicitly. | 2314 | ;; do want to reset the mode for VC, so we do it explicitly. |
| 2315 | (vc-find-file-hook) | 2315 | (vc-refresh-state) |
| 2316 | (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT) | 2316 | (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT) |
| 2317 | (smerge-start-session)))))))) | 2317 | (smerge-start-session)))))))) |
| 2318 | 2318 | ||