From 0f2d87716a2cb6fae5ea6719763441c448fe7a74 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sun, 31 Jan 2021 03:08:38 +0200 Subject: [PATCH] Recompute mode-lines when marking conflicts resolved * lisp/vc/vc.el (vc-mark-resolved): Recompute the mode lines of the affected files. --- lisp/vc/vc.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index bc9f11202b1..00976a07d42 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1549,6 +1549,9 @@ After check-out, runs the normal hook `vc-checkout-hook'." (vc-call-backend backend 'mark-resolved files) ;; FIXME: Is this TRTD? Might not be. `((vc-state . edited))) + ;; Recompute mode lines. + (dolist (file files) + (vc-mode-line file backend)) (message (substitute-command-keys "Conflicts have been resolved in %s. \ -- 2.39.2