diff options
| author | Po Lu | 2022-04-28 13:07:33 +0800 |
|---|---|---|
| committer | Po Lu | 2022-04-28 13:07:33 +0800 |
| commit | 9c70045f674b31db7a640d8a59939ce8df7ed37b (patch) | |
| tree | ec208dd1a61b9b21088f87953a5a5420b9a1da5a /src | |
| parent | 02ae85e8aa735b0d9a312f811d03204bf8fdbd51 (diff) | |
| download | emacs-9c70045f674b31db7a640d8a59939ce8df7ed37b.tar.gz emacs-9c70045f674b31db7a640d8a59939ce8df7ed37b.zip | |
Fix GTK build
* src/xrdb.c (x_load_resources): Fix definitions of `helv'.
Diffstat (limited to 'src')
| -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, | |||
| 383 | XrmDatabase db; | 383 | XrmDatabase db; |
| 384 | char line[256]; | 384 | char line[256]; |
| 385 | 385 | ||
| 386 | #if !(defined USE_CAIRO || defined HAVE_XFT) \ | ||
| 387 | && !defined USE_MOTIF && !defined USE_LUCID | ||
| 388 | const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; | ||
| 389 | #endif | ||
| 390 | |||
| 391 | x_rm_string = XrmStringToQuark (XrmStringType); | 386 | x_rm_string = XrmStringToQuark (XrmStringType); |
| 392 | #ifndef USE_X_TOOLKIT | 387 | #ifndef USE_X_TOOLKIT |
| 393 | /* pmr@osf.org says this shouldn't be done if USE_X_TOOLKIT. | 388 | /* 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, | |||
| 414 | sprintf (line, "Emacs.dialog*.background: grey75"); | 409 | sprintf (line, "Emacs.dialog*.background: grey75"); |
| 415 | XrmPutLineResource (&rdb, line); | 410 | XrmPutLineResource (&rdb, line); |
| 416 | #if !(defined USE_CAIRO || defined HAVE_XFT) || !defined (USE_LUCID) | 411 | #if !(defined USE_CAIRO || defined HAVE_XFT) || !defined (USE_LUCID) |
| 417 | sprintf (line, "Emacs.dialog*.font: %s", helv); | 412 | sprintf (line, "Emacs.dialog*.font: %s", |
| 413 | "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"); | ||
| 418 | XrmPutLineResource (&rdb, line); | 414 | XrmPutLineResource (&rdb, line); |
| 419 | sprintf (line, "*XlwMenu*font: %s", helv); | 415 | sprintf (line, "*XlwMenu*font: %s", |
| 416 | "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"); | ||
| 420 | XrmPutLineResource (&rdb, line); | 417 | XrmPutLineResource (&rdb, line); |
| 421 | #endif | 418 | #endif |
| 422 | sprintf (line, "*XlwMenu*background: grey75"); | 419 | sprintf (line, "*XlwMenu*background: grey75"); |