[Emacs-diffs] /srv/bzr/emacs/trunk r110435: In edebug-pop-to-buffer don't try to split the minibuffer window (Bug#10851).

[martin rudalics]

------------------------------------------------------------
revno: 110435
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 08:42:29 +0200
message:
  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).
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/edebug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-08 05:19:15 +0000
+++ b/lisp/ChangeLog    2012-10-08 06:42:29 +0000
@@ -1,3 +1,8 @@
+2012-10-08  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        Enhancements on forward-sexp movement.

=== modified file 'lisp/emacs-lisp/edebug.el'
--- a/lisp/emacs-lisp/edebug.el 2012-10-04 12:56:14 +0000
+++ b/lisp/emacs-lisp/edebug.el 2012-10-08 06:42:29 +0000
@@ -371,7 +371,7 @@
         ((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 @@
                  (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??