summaryrefslogtreecommitdiff
path: root/lisp/ediff-wind.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-wind.el')
-rw-r--r--lisp/ediff-wind.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 64018466508..e21817289ff 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -416,6 +416,10 @@ into icons, regardless of the window manager."
;; this lets us have local versions of ediff-split-window-function
split-window-function ediff-split-window-function
three-way-comparison ediff-3way-comparison-job))
+ ;; if in minibuffer go somewhere else
+ (if (save-match-data
+ (string-match "\*Minibuf-" (buffer-name (window-buffer))))
+ (select-window (next-window nil 'ignore-minibuf)))
(delete-other-windows)
(set-window-dedicated-p (selected-window) nil)
(split-window-vertically)