diff options
| author | Jan Djärv | 2005-07-11 14:28:43 +0000 |
|---|---|---|
| committer | Jan Djärv | 2005-07-11 14:28:43 +0000 |
| commit | a2d7e7225ce20a6bb9a6f3c4a39e9af1d9100d8d (patch) | |
| tree | 255cde29ef5f09352125ad16b171d011e0bf0cbe /src | |
| parent | ea6bc45dd29ec5c4dd5772e433291b489c53d312 (diff) | |
| download | emacs-a2d7e7225ce20a6bb9a6f3c4a39e9af1d9100d8d.tar.gz emacs-a2d7e7225ce20a6bb9a6f3c4a39e9af1d9100d8d.zip | |
* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Lucid if X_I18N, font otherwise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5c5654bfca9..c7b35c83175 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-07-11 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xfaces.c (x_update_menu_appearance): Use fontSet resource for | ||
| 4 | Lucid if X_I18N, font otherwise. | ||
| 5 | |||
| 1 | 2005-07-10 Steven Tamm <steventamm@mac.com> | 6 | 2005-07-10 Steven Tamm <steventamm@mac.com> |
| 2 | 7 | ||
| 3 | * mac.c (Fmac_get_file_type, Fmac_get_file_creator): Added. | 8 | * mac.c (Fmac_get_file_type, Fmac_get_file_creator): Added. |
diff --git a/src/xfaces.c b/src/xfaces.c index 616318daa63..2fb02360e50 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -4718,7 +4718,12 @@ x_update_menu_appearance (f) | |||
| 4718 | const char *suffix = "List"; | 4718 | const char *suffix = "List"; |
| 4719 | Bool motif = True; | 4719 | Bool motif = True; |
| 4720 | #else | 4720 | #else |
| 4721 | #if defined HAVE_X_I18N | ||
| 4722 | |||
| 4723 | const char *suffix = "Set"; | ||
| 4724 | #else | ||
| 4721 | const char *suffix = ""; | 4725 | const char *suffix = ""; |
| 4726 | #endif | ||
| 4722 | Bool motif = False; | 4727 | Bool motif = False; |
| 4723 | #endif | 4728 | #endif |
| 4724 | #if defined HAVE_X_I18N | 4729 | #if defined HAVE_X_I18N |