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 4f21112f3afa5848e167417b9f7472c4a3740816..5ced15cd58f3e4e3c8a8deb9f7bcb0c6bcc39a04 100644 (file)
--- 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 18d1661e985e30d820f1e053a8c64ee85ba1dd58..483ed64de208280a378089a414144dd57b7323b8 100644 (file)
--- 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??