diff options
author | Kenichi Handa <handa@gnu.org> | 2012-10-11 20:29:47 +0900 |
---|---|---|
committer | Kenichi Handa <handa@gnu.org> | 2012-10-11 20:29:47 +0900 |
commit | d3e4228575e9ba9e99dc4a7dae788280ffcc4566 (patch) | |
tree | 97d35f3c0766372c166a31f3c0f7aba791a38dde /lisp/emacs-lisp/edebug.el | |
parent | cde44a7728488ca6bc6a46c18d9c5e647b160547 (diff) | |
parent | fd2f90cf5c6a15610aa1e17e73d6d8a5f8cb1999 (diff) | |
download | emacs-d3e4228575e9ba9e99dc4a7dae788280ffcc4566.tar.gz emacs-d3e4228575e9ba9e99dc4a7dae788280ffcc4566.tar.bz2 emacs-d3e4228575e9ba9e99dc4a7dae788280ffcc4566.zip |
merge trunk
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
-rw-r--r-- | lisp/emacs-lisp/edebug.el | 4 |
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?? |