From dfa2e4a6e6cbf64df9031858c473b0e0ab1a00d3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 28 Oct 2015 14:00:24 -0400 Subject: [PATCH] * lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state. --- lisp/vc/pcvs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)))))))) -- 2.39.5