diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/xsettings.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index ec45d47f9b7..8dbc7d990fe 100644 --- a/src/xsettings.c +++ b/src/xsettings.c | |||
| @@ -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. */ |