martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state.

Browse Source
This commit is contained in:
Stefan Monnier
2015-10-28 14:00:24 -04:00
parent d5ee655c17
commit dfa2e4a6e6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/vc/pcvs.el
View File

@@ -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))))))))