diff options
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/xterm.c b/src/xterm.c index 54cac40e091..91a65fc32cb 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -325,9 +325,6 @@ static Lisp_Object Qlatin_1; | |||
| 325 | #ifdef USE_GTK | 325 | #ifdef USE_GTK |
| 326 | /* The name of the Emacs icon file. */ | 326 | /* The name of the Emacs icon file. */ |
| 327 | static Lisp_Object xg_default_icon_file; | 327 | static Lisp_Object xg_default_icon_file; |
| 328 | |||
| 329 | /* Used in gtkutil.c. */ | ||
| 330 | Lisp_Object Qx_gtk_map_stock; | ||
| 331 | #endif | 328 | #endif |
| 332 | 329 | ||
| 333 | /* Used in x_flush. */ | 330 | /* Used in x_flush. */ |
| @@ -9265,7 +9262,7 @@ x_make_frame_visible (f) | |||
| 9265 | } | 9262 | } |
| 9266 | #else /* not USE_X_TOOLKIT */ | 9263 | #else /* not USE_X_TOOLKIT */ |
| 9267 | #ifdef USE_GTK | 9264 | #ifdef USE_GTK |
| 9268 | gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f)); | 9265 | gtk_widget_show (FRAME_GTK_OUTER_WIDGET (f)); |
| 9269 | gtk_window_deiconify (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | 9266 | gtk_window_deiconify (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
| 9270 | #else | 9267 | #else |
| 9271 | if (FRAME_X_EMBEDDED_P (f)) | 9268 | if (FRAME_X_EMBEDDED_P (f)) |
| @@ -10970,9 +10967,6 @@ syms_of_xterm () | |||
| 10970 | #ifdef USE_GTK | 10967 | #ifdef USE_GTK |
| 10971 | xg_default_icon_file = make_pure_c_string ("icons/hicolor/scalable/apps/emacs.svg"); | 10968 | xg_default_icon_file = make_pure_c_string ("icons/hicolor/scalable/apps/emacs.svg"); |
| 10972 | staticpro (&xg_default_icon_file); | 10969 | staticpro (&xg_default_icon_file); |
| 10973 | |||
| 10974 | Qx_gtk_map_stock = intern_c_string ("x-gtk-map-stock"); | ||
| 10975 | staticpro (&Qx_gtk_map_stock); | ||
| 10976 | #endif | 10970 | #endif |
| 10977 | 10971 | ||
| 10978 | DEFVAR_BOOL ("x-use-underline-position-properties", | 10972 | DEFVAR_BOOL ("x-use-underline-position-properties", |