diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xfns.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9ac2695a0e0..aac111f680e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-10-18 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2014-10-18 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * xfns.c (syms_of_xfns): Remove x-gtk-whole-detached-tool-bar. | ||
| 4 | |||
| 3 | * xterm.h (handlebox_widget): Remove. | 5 | * xterm.h (handlebox_widget): Remove. |
| 4 | 6 | ||
| 5 | * xmenu.c (set_frame_menubar): Remove GTK block that calls | 7 | * xmenu.c (set_frame_menubar): Remove GTK block that calls |
diff --git a/src/xfns.c b/src/xfns.c index 5edb635b182..8f5a06c0330 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -6162,12 +6162,6 @@ If more space for files in the file chooser dialog is wanted, set this to nil | |||
| 6162 | to turn the additional text off. */); | 6162 | to turn the additional text off. */); |
| 6163 | x_gtk_file_dialog_help_text = 1; | 6163 | x_gtk_file_dialog_help_text = 1; |
| 6164 | 6164 | ||
| 6165 | DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", x_gtk_whole_detached_tool_bar, | ||
| 6166 | doc: /* If non-nil, a detached tool bar is shown in full. | ||
| 6167 | The default is to just show an arrow and pressing on that arrow shows | ||
| 6168 | the tool bar buttons. */); | ||
| 6169 | x_gtk_whole_detached_tool_bar = 0; | ||
| 6170 | |||
| 6171 | DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips, | 6165 | DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips, |
| 6172 | doc: /* If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used. | 6166 | doc: /* If non-nil with a Gtk+ built Emacs, the Gtk+ tooltip is used. |
| 6173 | Otherwise use Emacs own tooltip implementation. | 6167 | Otherwise use Emacs own tooltip implementation. |