diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-04-28 13:07:33 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-04-28 13:07:33 +0800 |
| commit | 9c70045f674b31db7a640d8a59939ce8df7ed37b (patch) | |
| tree | ec208dd1a61b9b21088f87953a5a5420b9a1da5a /src/xrdb.c | |
| parent | 02ae85e8aa735b0d9a312f811d03204bf8fdbd51 (diff) | |
| download | emacs-9c70045f674b31db7a640d8a59939ce8df7ed37b.tar.gz emacs-9c70045f674b31db7a640d8a59939ce8df7ed37b.tar.bz2 emacs-9c70045f674b31db7a640d8a59939ce8df7ed37b.zip | |
Fix GTK build
* src/xrdb.c (x_load_resources): Fix definitions of `helv'.
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 67d9f57f7d2..aa79d719c8c 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -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"); |