diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/xsettings.c | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index 066f426d241..8dbc7d990fe 100644 --- a/src/xsettings.c +++ b/src/xsettings.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Functions for handling font and other changes dynamically. | 1 | /* Functions for handling font and other changes dynamically. |
| 2 | 2 | ||
| 3 | Copyright (C) 2009-2014 Free Software Foundation, Inc. | 3 | Copyright (C) 2009-2015 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -51,8 +51,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 51 | static char *current_mono_font; | 51 | static char *current_mono_font; |
| 52 | static char *current_font; | 52 | static char *current_font; |
| 53 | static struct x_display_info *first_dpyinfo; | 53 | static struct x_display_info *first_dpyinfo; |
| 54 | static Lisp_Object Qmonospace_font_name, Qfont_name, Qfont_render, | ||
| 55 | Qtool_bar_style; | ||
| 56 | static Lisp_Object current_tool_bar_style; | 54 | static Lisp_Object current_tool_bar_style; |
| 57 | 55 | ||
| 58 | /* Store an config changed event in to the event queue. */ | 56 | /* Store an config changed event in to the event queue. */ |