Mercurial > emacs
comparison src/xterm.c @ 103916:9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
* gtkutil.c (update_frame_tool_bar): Use Qx_gtk_map_stock instead of
calling intern each time.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 16 Jul 2009 01:24:00 +0000 |
parents | 143908a11f1f |
children | 3abca9a8122f |
comparison
equal
deleted
inserted
replaced
103915:b22ca6941b7b | 103916:9653887b5cd0 |
---|---|
321 static Lisp_Object Qlatin_1; | 321 static Lisp_Object Qlatin_1; |
322 | 322 |
323 #ifdef USE_GTK | 323 #ifdef USE_GTK |
324 /* The name of the Emacs icon file. */ | 324 /* The name of the Emacs icon file. */ |
325 static Lisp_Object xg_default_icon_file; | 325 static Lisp_Object xg_default_icon_file; |
326 | |
327 /* Used in gtkutil.c. */ | |
328 Lisp_Object Qx_gtk_map_stock; | |
326 #endif | 329 #endif |
327 | 330 |
328 /* Used in x_flush. */ | 331 /* Used in x_flush. */ |
329 | 332 |
330 extern Lisp_Object Vinhibit_redisplay; | 333 extern Lisp_Object Vinhibit_redisplay; |
10786 last_mouse_press_frame = Qnil; | 10789 last_mouse_press_frame = Qnil; |
10787 | 10790 |
10788 #ifdef USE_GTK | 10791 #ifdef USE_GTK |
10789 xg_default_icon_file = build_string ("icons/hicolor/scalable/apps/emacs.svg"); | 10792 xg_default_icon_file = build_string ("icons/hicolor/scalable/apps/emacs.svg"); |
10790 staticpro (&xg_default_icon_file); | 10793 staticpro (&xg_default_icon_file); |
10794 | |
10795 Qx_gtk_map_stock = intern ("x-gtk-map-stock"); | |
10796 staticpro (&Qx_gtk_map_stock); | |
10791 #endif | 10797 #endif |
10792 | 10798 |
10793 DEFVAR_BOOL ("x-use-underline-position-properties", | 10799 DEFVAR_BOOL ("x-use-underline-position-properties", |
10794 &x_use_underline_position_properties, | 10800 &x_use_underline_position_properties, |
10795 doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. | 10801 doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. |