[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master dfa2e4a: * lisp/vc/pcvs.el (cvs-revert-if-needed):
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master dfa2e4a: * lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state. |
Date: |
Wed, 28 Oct 2015 18:00:27 +0000 |
branch: master
commit dfa2e4a6e6cbf64df9031858c473b0e0ab1a00d3
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state.
---
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 f6a9e08..3fdee10 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))))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master dfa2e4a: * lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state.,
Stefan Monnier <=