projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5ee655
)
* lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state.
author
Stefan Monnier
<monnier@iro.umontreal.ca>
Wed, 28 Oct 2015 18:00:24 +0000
(14:00 -0400)
committer
Stefan Monnier
<monnier@iro.umontreal.ca>
Wed, 28 Oct 2015 18:00:24 +0000
(14:00 -0400)
lisp/vc/pcvs.el
patch
|
blob
|
history
diff --git
a/lisp/vc/pcvs.el
b/lisp/vc/pcvs.el
index f6a9e08d84b808fa6595c13528a6ae2cac81a08c..3fdee100d44d485c52740a584df089823f7bb503 100644
(file)
--- 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))))))))