From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 28 Sep 2015 15:53:26 +0000 (+0300)
Subject: Avoid redisplay error in ediff-regions-wordwise
X-Git-Tag: emacs-25.0.90~1223^2~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f279344e4c4fad595d359d6d0aa619dea16c308;p=emacs.git

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)
---

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)