Commit 36431e16 authored by Stefan Kangas's avatar Stefan Kangas

Make initial frame match frame-title-format

* src/xterm.c (x_term_init):
* src/w32term.c (w32_initialize_display_info): Sync initial frame
title with new value of Vframe_title_format.
Problem reported by Angelo Graziosi <angelo.g0@libero.it>.
parent f08e6538
......@@ -7165,15 +7165,21 @@ w32_initialize_display_info (Lisp_Object display_name)
memset (dpyinfo, 0, sizeof (*dpyinfo));
dpyinfo->name_list_element = Fcons (display_name, Qnil);
static char const title[] = "GNU Emacs";
if (STRINGP (Vsystem_name))
{
dpyinfo->w32_id_name = xmalloc (SCHARS (Vinvocation_name)
+ SCHARS (Vsystem_name) + 2);
sprintf (dpyinfo->w32_id_name, "%s@%s",
SDATA (Vinvocation_name), SDATA (Vsystem_name));
static char const at[] = " at ";
ptrdiff_t nbytes = sizeof (title) + sizeof (at);
if (INT_ADD_WRAPV (nbytes, SCHARS (Vsystem_name), &nbytes))
memory_full (SIZE_MAX);
dpyinfo->w32_id_name = xmalloc (nbytes);
sprintf (dpyinfo->w32_id_name, "%s%s%s", title, at, SDATA (Vsystem_name));
}
else
dpyinfo->w32_id_name = xlispstrdup (Vinvocation_name);
{
dpyinfo->w32_id_name = xmalloc (sizeof (title));
strcpy (dpyinfo->w32_id_name, title);
}
/* Default Console mode values - overridden when running in GUI mode
with values obtained from system metrics. */
......
......@@ -12928,19 +12928,23 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
#endif
Lisp_Object system_name = Fsystem_name ();
ptrdiff_t nbytes = SBYTES (Vinvocation_name) + 1;
if (STRINGP (system_name)
&& INT_ADD_WRAPV (nbytes, SBYTES (system_name) + 1, &nbytes))
memory_full (SIZE_MAX);
dpyinfo->x_id = ++x_display_id;
dpyinfo->x_id_name = xmalloc (nbytes);
char *nametail = lispstpcpy (dpyinfo->x_id_name, Vinvocation_name);
static char const title[] = "GNU Emacs";
if (STRINGP (system_name))
{
*nametail++ = '@';
lispstpcpy (nametail, system_name);
static char const at[] = " at ";
ptrdiff_t nbytes = sizeof (title) + sizeof (at);
if (INT_ADD_WRAPV (nbytes, SBYTES (system_name), &nbytes))
memory_full (SIZE_MAX);
dpyinfo->x_id_name = xmalloc (nbytes);
sprintf (dpyinfo->x_id_name, "%s%s%s", title, at, SDATA (system_name));
}
else
{
dpyinfo->x_id_name = xmalloc (sizeof (title));
strcpy (dpyinfo->x_id_name, title);
}
dpyinfo->x_id = ++x_display_id;
/* Figure out which modifier bits mean what. */
x_find_modifier_meanings (dpyinfo);
......
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