bug#22048: 25.1; frame title vanishes when speedbar present

[David Reitter]

On Nov 29, 2015, at 2:50 PM, Eli Zaretskii <eliz@gnu.org> wrote:

>> x_implicitly_set_name() might not be called in the right context for frames 
>> that are not selected.
> 
> That shouldn't happen, normally.  Displaying a frame temporarily makes
> it the selected frame.

The buffer was not current in x_consider_frame_title when x_implicitly_set_name 
is called.

The consequences then are obvious, as it picks up the wrong Vframe_title_format 
for the frame.

I believe the change below is the correct one.  It affects all platforms, 
though.

Are you okay with this change?  If so, I would commit it.

- David



diff --git a/src/xdisp.c b/src/xdisp.c
index 50c5518..07c771a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11602,7 +11602,6 @@ x_consider_frame_title (Lisp_Object frame)
       display_mode_element (&it, 0, -1, -1, fmt, Qnil, false);
       len = MODE_LINE_NOPROP_LEN (title_start);
       title = mode_line_noprop_buf + title_start;
-      unbind_to (count, Qnil);
 
       /* Set the title only if it's changed.  This avoids consing in
         the common case where it hasn't.  (If it turns out that we've
@@ -11613,6 +11612,9 @@ x_consider_frame_title (Lisp_Object frame)
          || SBYTES (f->name) != len
          || memcmp (title, SDATA (f->name), len) != 0)
        x_implicitly_set_name (f, make_string (title, len), Qnil);
+
+      unbind_to (count, Qnil);
+
     }
 }