diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-10-28 14:00:24 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-10-28 14:00:24 -0400 |
| commit | dfa2e4a6e6cbf64df9031858c473b0e0ab1a00d3 (patch) | |
| tree | 9b06952d0923a4f37a8e07480a804adf39684234 /lisp/vc/pcvs.el | |
| parent | d5ee655c1710a62e01513fd20256a7cf35d52167 (diff) | |
| download | emacs-dfa2e4a6e6cbf64df9031858c473b0e0ab1a00d3.tar.gz | |
* lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state.
Diffstat (limited to 'lisp/vc/pcvs.el')
| -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." (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) ;; `preserve-modes' avoids changing the (minor) modes. But we ;; do want to reset the mode for VC, so we do it explicitly. - (vc-find-file-hook) + (vc-refresh-state) (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT) (smerge-start-session)))))))) |