martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GTK build

Browse Source 
* src/xrdb.c (x_load_resources): Fix definitions of `helv'.
This commit is contained in:
Po Lu
2022-04-28 13:07:33 +08:00
parent 02ae85e8aa
commit 9c70045f67
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/xrdb.c
View File

@@ -383,11 +383,6 @@ x_load_resources (Display *display, const char *xrm_string,
XrmDatabase db;
char line[256];
#if !(defined USE_CAIRO || defined HAVE_XFT) \
&& !defined USE_MOTIF && !defined USE_LUCID
const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
#endif
x_rm_string = XrmStringToQuark (XrmStringType);
#ifndef USE_X_TOOLKIT
/* pmr@osf.org says this shouldn't be done if USE_X_TOOLKIT.
@@ -414,9 +409,11 @@ x_load_resources (Display *display, const char *xrm_string,
sprintf (line, "Emacs.dialog*.background: grey75");
XrmPutLineResource (&rdb, line);
#if !(defined USE_CAIRO || defined HAVE_XFT) || !defined (USE_LUCID)
sprintf (line, "Emacs.dialog*.font: %s", helv);
sprintf (line, "Emacs.dialog*.font: %s",
"-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1");
XrmPutLineResource (&rdb, line);
sprintf (line, "*XlwMenu*font: %s", helv);
sprintf (line, "*XlwMenu*font: %s",
"-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1");
XrmPutLineResource (&rdb, line);
#endif
sprintf (line, "*XlwMenu*background: grey75");