diff options
| author | Joakim Verona | 2012-09-19 01:09:51 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-09-19 01:09:51 +0200 |
| commit | 6c86337db3f2b22977d7b94b054458a2d446c504 (patch) | |
| tree | 04725c50cbd76c8ffd0faf4cdce895a89a506a58 /src/xsettings.c | |
| parent | aac9139d11cf7f9ee84d931ada85be8fa0c90f21 (diff) | |
| parent | fefa299077c02a931e5e72f7646e3dfa28f5e8ff (diff) | |
| download | emacs-6c86337db3f2b22977d7b94b054458a2d446c504.tar.gz emacs-6c86337db3f2b22977d7b94b054458a2d446c504.zip | |
not compiling yet
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index a28d75d9422..58c84495489 100644 --- a/src/xsettings.c +++ b/src/xsettings.c | |||
| @@ -21,7 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 21 | 21 | ||
| 22 | #include <float.h> | 22 | #include <float.h> |
| 23 | #include <limits.h> | 23 | #include <limits.h> |
| 24 | #include <setjmp.h> | ||
| 25 | #include <fcntl.h> | 24 | #include <fcntl.h> |
| 26 | #include "lisp.h" | 25 | #include "lisp.h" |
| 27 | #include "xterm.h" | 26 | #include "xterm.h" |
| @@ -711,12 +710,12 @@ apply_xft_settings (struct x_display_info *dpyinfo, | |||
| 711 | if (send_event_p) | 710 | if (send_event_p) |
| 712 | store_config_changed_event (Qfont_render, | 711 | store_config_changed_event (Qfont_render, |
| 713 | XCAR (dpyinfo->name_list_element)); | 712 | XCAR (dpyinfo->name_list_element)); |
| 714 | Vxft_settings | 713 | Vxft_settings |
| 715 | = make_formatted_string (buf, format, | 714 | = make_formatted_string (buf, format, |
| 716 | oldsettings.aa, oldsettings.hinting, | 715 | oldsettings.aa, oldsettings.hinting, |
| 717 | oldsettings.rgba, oldsettings.lcdfilter, | 716 | oldsettings.rgba, oldsettings.lcdfilter, |
| 718 | oldsettings.hintstyle, oldsettings.dpi); | 717 | oldsettings.hintstyle, oldsettings.dpi); |
| 719 | 718 | ||
| 720 | } | 719 | } |
| 721 | else | 720 | else |
| 722 | FcPatternDestroy (pat); | 721 | FcPatternDestroy (pat); |