diff options
| author | Eli Zaretskii | 2015-09-28 18:53:26 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-09-28 18:53:26 +0300 |
| commit | 1f279344e4c4fad595d359d6d0aa619dea16c308 (patch) | |
| tree | bf21816e2889c3ee73d72661c2718967abc5a0b2 | |
| parent | 3a0974d939233ea04057ecf153d3b6272f30cd4b (diff) | |
| download | emacs-1f279344e4c4fad595d359d6d0aa619dea16c308.tar.gz emacs-1f279344e4c4fad595d359d6d0aa619dea16c308.zip | |
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)
| -rw-r--r-- | lisp/vc/ediff-util.el | 1 |
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 | |||
| 3348 | (setq wind (ediff-get-visible-buffer-window cloned-buff)) | 3348 | (setq wind (ediff-get-visible-buffer-window cloned-buff)) |
| 3349 | (select-window wind) | 3349 | (select-window wind) |
| 3350 | (delete-other-windows) | 3350 | (delete-other-windows) |
| 3351 | (or (mark) (push-mark)) | ||
| 3351 | (ediff-activate-mark) | 3352 | (ediff-activate-mark) |
| 3352 | (split-window-vertically) | 3353 | (split-window-vertically) |
| 3353 | (ediff-select-lowest-window) | 3354 | (ediff-select-lowest-window) |