Mercurial > emacs
changeset 827:731cb9bcbad0
*** empty log message ***
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Tue, 21 Jul 1992 06:30:52 +0000 |
| parents | e9b9a1cff2c9 |
| children | 4b56424868f6 |
| files | lisp/frame.el src/xdisp.c |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/frame.el Tue Jul 21 04:09:28 1992 +0000 +++ b/lisp/frame.el Tue Jul 21 06:30:52 1992 +0000 @@ -141,7 +141,7 @@ ;;; Return some frame other than the current frame, ;;; creating one if neccessary. Note that the minibuffer frame, if ;;; separate, is not considered (see next-frame). -(defun get-frame () +(defun get-other-frame () (let ((s (if (equal (next-frame (selected-frame)) (selected-frame)) (new-frame) (next-frame (selected-frame)))))
--- a/src/xdisp.c Tue Jul 21 04:09:28 1992 +0000 +++ b/src/xdisp.c Tue Jul 21 06:30:52 1992 +0000 @@ -193,8 +193,13 @@ else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) { #ifdef MULTI_FRAME + Lisp_Object minibuf_frame; + choose_minibuf_frame (); - Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window))); + minibuf_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); + if (FRAME_VISIBLE_P (selected_frame) + && ! FRAME_VISIBLE_P (XFRAME (minibuf_frame))) + Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window))); #endif { @@ -244,8 +249,13 @@ else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) { #ifdef MULTI_FRAME + Lisp_Object minibuf_frame; + choose_minibuf_frame (); - Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window))); + minibuf_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); + if (FRAME_VISIBLE_P (selected_frame) + && ! FRAME_VISIBLE_P (XFRAME (minibuf_frame))) + Fmake_frame_visible (WINDOW_FRAME (XWINDOW (minibuf_window))); #endif echo_area_glyphs = m; @@ -1771,6 +1781,7 @@ if (FRAME_IS_X (f) && ! FRAME_MINIBUF_ONLY_P (f) && w == XWINDOW (f->selected_window) + && XINT (Flength (Vframe_list)) > 1 && (NILP (Fstring_equal (XBUFFER (w->buffer)->name, f->name)))) x_set_name (f, XBUFFER (w->buffer)->name, Qnil); #endif