[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 9c70045f67: Fix GTK build
From: |
Po Lu |
Subject: |
master 9c70045f67: Fix GTK build |
Date: |
Thu, 28 Apr 2022 01:07:56 -0400 (EDT) |
branch: master
commit 9c70045f674b31db7a640d8a59939ce8df7ed37b
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Fix GTK build
* src/xrdb.c (x_load_resources): Fix definitions of `helv'.
---
src/xrdb.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/xrdb.c b/src/xrdb.c
index 67d9f57f7d..aa79d719c8 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");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 9c70045f67: Fix GTK build,
Po Lu <=