From: Po Lu <luangruo@yahoo.com>
Date: Thu, 28 Apr 2022 05:07:33 +0000 (+0800)
Subject: Fix GTK build
X-Git-Tag: emacs-29.0.90~1931^2~252
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c70045f674b31db7a640d8a59939ce8df7ed37b;p=emacs.git

Fix GTK build

* src/xrdb.c (x_load_resources): Fix definitions of `helv'.
---

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");