* xdisp.c (display_mode_line): If the only other frames are

	minibuffer frames, don't name the frame after the in the selected
	window.  We can use Fnext_frame to do this test easily.

1 files changed, 11 insertions, 4 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 46d9cc2f080..a44f988a8ab 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1776,14 +1776,21 @@ display_mode_line (w)
 
 #ifdef HAVE_X_WINDOWS
   /* I'm trying this out because I saw Unimpress use it, but it's
-     possible that this may mess adversely with some window managers.  jla */
+     possible that this may mess adversely with some window managers.  -jla
 
+     Wouldn't it be nice to use something like mode-line-format to
+     describe frame titles?  -JimB  */
+
+  /* Change the title of the frame to the name of the buffer displayed
+     in the currently selected window.  Don't do this for minibuffer frames,
+     and don't do it when there's only one non-minibuffer frame.  */
   if (FRAME_X_P (f)
       && ! FRAME_MINIBUF_ONLY_P (f)
       && w == XWINDOW (f->selected_window))
-    x_implicitly_set_name (f, ((XINT (Flength (Vframe_list)) > 1)
-                               ? XBUFFER (w->buffer)->name
-                               : Qnil),
+    x_implicitly_set_name (f, (EQ (Fnext_frame (WINDOW_FRAME (w), Qnil),
+                                   WINDOW_FRAME (w))
+                               ? Qnil
+                               : XBUFFER (w->buffer)->name),
                            Qnil);
 #endif
 }