summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2012-10-08 08:42:29 +0200
committerMartin Rudalics <rudalics@gmx.at>2012-10-08 08:42:29 +0200
commit6a0886306eeabccd66330ded9001602194ae5fd3 (patch)
tree4f0548802ca2fbb440c6e0050bc797c06b8466e9 /lisp/emacs-lisp
parent8dbce54cc73d16375b8d233da7271054eb4cda34 (diff)
downloademacs-6a0886306eeabccd66330ded9001602194ae5fd3.tar.gz
emacs-6a0886306eeabccd66330ded9001602194ae5fd3.tar.bz2
emacs-6a0886306eeabccd66330ded9001602194ae5fd3.zip
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).
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/edebug.el4
1 files changed, 2 insertions, 2 deletions
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??