diff options
| author | Paul Eggert | 2011-07-02 23:17:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-02 23:17:19 -0700 |
| commit | 2e13213db29863814c5edac6d731731eda24e357 (patch) | |
| tree | bea0d2171a392964f2f180863c44fa0394c47aae /src/ChangeLog | |
| parent | cf7cff578408753b6a7bade084f1147b0e3d9618 (diff) | |
| download | emacs-2e13213db29863814c5edac6d731731eda24e357.tar.gz emacs-2e13213db29863814c5edac6d731731eda24e357.zip | |
* xsettings.c (SYSTEM_FONT): Define only when used.
No need to define when HAVE_GSETTINGS || !HAVE_XFT.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e2f66eec15b..d77a246a50a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-07-03 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-07-03 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xsettings.c (SYSTEM_FONT): Define only when used. | ||
| 4 | No need to define when HAVE_GSETTINGS || !HAVE_XFT. | ||
| 5 | |||
| 3 | * keymap.c (access_keymap_1): Now static. | 6 | * keymap.c (access_keymap_1): Now static. |
| 4 | 7 | ||
| 5 | 2011-07-02 Chong Yidong <cyd@stupidchicken.com> | 8 | 2011-07-02 Chong Yidong <cyd@stupidchicken.com> |