From 1f279344e4c4fad595d359d6d0aa619dea16c308 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 28 Sep 2015 18:53:26 +0300 Subject: [PATCH] Avoid redisplay error in ediff-regions-wordwise * lisp/vc/ediff-util.el (ediff-clone-buffer-for-region-comparison): Make sure the mark is set before activating it. (Bug#21567) --- lisp/vc/ediff-util.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index e664f9fdac3..7ef425449c1 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3348,6 +3348,7 @@ Without an argument, it saves customized diff argument, if available (setq wind (ediff-get-visible-buffer-window cloned-buff)) (select-window wind) (delete-other-windows) + (or (mark) (push-mark)) (ediff-activate-mark) (split-window-vertically) (ediff-select-lowest-window) -- 2.11.4.GIT