From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 8 Oct 2012 06:42:29 +0000 (+0200)
Subject: In edebug-pop-to-buffer don't try to split the minibuffer window (Bug#10851).
X-Git-Tag: emacs-24.2.90~237^2~70
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a0886306eeabccd66330ded9001602194ae5fd3;p=emacs.git

In edebug-pop-to-buffer don't try to split the minibuffer window (Bug#10851).

* emacs-lisp/edebug.el (edebug-pop-to-buffer): Don't try to split
the minibuffer window (Bug#10851).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f21112f3af..5ced15cd58f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-08  Martin Rudalics  <rudalics@gmx.at>
+
+	* emacs-lisp/edebug.el (edebug-pop-to-buffer): Don't try to split
+	the minibuffer window (Bug#10851).
+
 2012-10-08  Fabián Ezequiel Gallina  <fgallina@cuca>
 
 	Enhancements on forward-sexp movement.
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 18d1661e985..483ed64de20 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -371,7 +371,7 @@ Return the result of the last expression in BODY."
 	 ((get-buffer-window buffer 0))
 	 ((one-window-p 'nomini)
 	  ;; When there's one window only, split it.
-	  (split-window))
+	  (split-window (minibuffer-selected-window)))
 	 ((let ((trace-window (get-buffer-window edebug-trace-buffer)))
 	    (catch 'found
 	      (dolist (elt (window-list nil 'nomini))
@@ -382,7 +382,7 @@ Return the result of the last expression in BODY."
 		  (throw 'found elt))))))
 	 ;; All windows are dedicated or show `edebug-trace-buffer', split
 	 ;; selected one.
-	 (t (split-window))))
+	 (t (split-window (minibuffer-selected-window)))))
   (set-window-buffer window buffer)
   (select-window window)
   (set-window-hscroll window 0)) ;; should this be??