Commit 7253d8e0 authored by Jim Blandy's avatar Jim Blandy
Browse files

*** empty log message ***

parent 151bdc83
...@@ -141,7 +141,7 @@ These supercede the values given in default-frame-alist.") ...@@ -141,7 +141,7 @@ These supercede the values given in default-frame-alist.")
;;; Return some frame other than the current frame, ;;; Return some frame other than the current frame,
;;; creating one if neccessary. Note that the minibuffer frame, if ;;; creating one if neccessary. Note that the minibuffer frame, if
;;; separate, is not considered (see next-frame). ;;; separate, is not considered (see next-frame).
(defun get-frame () (defun get-other-frame ()
(let ((s (if (equal (next-frame (selected-frame)) (selected-frame)) (let ((s (if (equal (next-frame (selected-frame)) (selected-frame))
(new-frame) (new-frame)
(next-frame (selected-frame))))) (next-frame (selected-frame)))))
......
...@@ -193,8 +193,13 @@ message (m, a1, a2, a3) ...@@ -193,8 +193,13 @@ message (m, a1, a2, a3)
else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
{ {
#ifdef MULTI_FRAME #ifdef MULTI_FRAME
Lisp_Object minibuf_frame;
choose_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 #endif
{ {
...@@ -244,8 +249,13 @@ message1 (m) ...@@ -244,8 +249,13 @@ message1 (m)
else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame)) else if (INTERACTIVE && FRAME_MESSAGE_BUF (selected_frame))
{ {
#ifdef MULTI_FRAME #ifdef MULTI_FRAME
Lisp_Object minibuf_frame;
choose_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 #endif
echo_area_glyphs = m; echo_area_glyphs = m;
...@@ -1771,6 +1781,7 @@ display_mode_line (w) ...@@ -1771,6 +1781,7 @@ display_mode_line (w)
if (FRAME_IS_X (f) if (FRAME_IS_X (f)
&& ! FRAME_MINIBUF_ONLY_P (f) && ! FRAME_MINIBUF_ONLY_P (f)
&& w == XWINDOW (f->selected_window) && w == XWINDOW (f->selected_window)
&& XINT (Flength (Vframe_list)) > 1
&& (NILP (Fstring_equal (XBUFFER (w->buffer)->name, f->name)))) && (NILP (Fstring_equal (XBUFFER (w->buffer)->name, f->name))))
x_set_name (f, XBUFFER (w->buffer)->name, Qnil); x_set_name (f, XBUFFER (w->buffer)->name, Qnil);
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment