[Emacs-diffs] Changes to emacs/lisp/ediff-wind.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   08/11/16 04:55:48

Index: ediff-wind.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-wind.el,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- ediff-wind.el       6 May 2008 07:57:33 -0000       1.62
+++ ediff-wind.el       16 Nov 2008 04:55:47 -0000      1.63
@@ -416,6 +416,10 @@
            ;; 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)