masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-06 12:19:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix --no-build-details for w32 and macOS

Browse source 
* src/w32term.c (w32_initialize_display_info): Handle nil system-name.
* lisp/term/ns-win.el (window-system-initialization): Don't pass nil
to `x-open-connection'.
This commit is contained in:
Noam Postavsky 2018-02-06 12:20:37 -05:00
parent 979944c9b0
commit 19fa6d561a
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/term/ns-win.el
View file

@ -834,7 +834,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
(format "Creation of the standard fontset failed: %s" err) (format "Creation of the standard fontset failed: %s" err)
:error))) :error)))
(x-open-connection (system-name) x-command-line-resources t) (x-open-connection (or (system-name) "") x-command-line-resources t)
;; Add GNUstep menu items Services, Hide and Quit. Rename Help to Info ;; Add GNUstep menu items Services, Hide and Quit. Rename Help to Info
;; and put it first (i.e. omit from menu-bar-final-items. ;; and put it first (i.e. omit from menu-bar-final-items.

5
src/w32term.c
View file

@ -6922,10 +6922,15 @@ w32_initialize_display_info (Lisp_Object display_name)
memset (dpyinfo, 0, sizeof (*dpyinfo)); memset (dpyinfo, 0, sizeof (*dpyinfo));
dpyinfo->name_list_element = Fcons (display_name, Qnil); dpyinfo->name_list_element = Fcons (display_name, Qnil);
if (STRINGP (Vsystem_name))
{
dpyinfo->w32_id_name = xmalloc (SCHARS (Vinvocation_name) dpyinfo->w32_id_name = xmalloc (SCHARS (Vinvocation_name)
+ SCHARS (Vsystem_name) + 2); + SCHARS (Vsystem_name) + 2);
sprintf (dpyinfo->w32_id_name, "%s@%s", sprintf (dpyinfo->w32_id_name, "%s@%s",
SDATA (Vinvocation_name), SDATA (Vsystem_name)); SDATA (Vinvocation_name), SDATA (Vsystem_name));
}
else
dpyinfo->w32_id_name = xlispstrdup (Vinvocation_name);
/* Default Console mode values - overridden when running in GUI mode /* Default Console mode values - overridden when running in GUI mode
with values obtained from system metrics. */ with values obtained from system metrics. */