diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/xsettings.h | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/xsettings.h')
| -rw-r--r-- | src/xsettings.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xsettings.h b/src/xsettings.h index 5b2fdbf43c5..38448eb88f5 100644 --- a/src/xsettings.h +++ b/src/xsettings.h | |||
| @@ -26,8 +26,9 @@ extern void xsettings_initialize (struct x_display_info *dpyinfo); | |||
| 26 | extern void xft_settings_event (struct x_display_info *dpyinfo, | 26 | extern void xft_settings_event (struct x_display_info *dpyinfo, |
| 27 | XEvent *); | 27 | XEvent *); |
| 28 | extern const char *xsettings_get_system_font (void); | 28 | extern const char *xsettings_get_system_font (void); |
| 29 | #ifdef USE_LUCID | ||
| 29 | extern const char *xsettings_get_system_normal_font (void); | 30 | extern const char *xsettings_get_system_normal_font (void); |
| 31 | #endif | ||
| 30 | 32 | ||
| 31 | 33 | ||
| 32 | #endif /* XSETTINGS_H */ | 34 | #endif /* XSETTINGS_H */ |
| 33 | |||