summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-util.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-09-28 18:53:26 +0300
committerEli Zaretskii <eliz@gnu.org>2015-09-28 18:53:26 +0300
commit1f279344e4c4fad595d359d6d0aa619dea16c308 (patch)
treebf21816e2889c3ee73d72661c2718967abc5a0b2 /lisp/vc/ediff-util.el
parent3a0974d939233ea04057ecf153d3b6272f30cd4b (diff)
downloademacs-1f279344e4c4fad595d359d6d0aa619dea16c308.tar.gz
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)
Diffstat (limited to 'lisp/vc/ediff-util.el')
-rw-r--r--lisp/vc/ediff-util.el1
1 files changed, 1 insertions, 0 deletions
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)