[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog gtkutil.c xterm.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog gtkutil.c xterm.c |
Date: |
Thu, 16 Jul 2009 01:24:03 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/07/16 01:24:02
Modified files:
src : ChangeLog gtkutil.c xterm.c
Log message:
* 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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7649&r2=1.7650
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.157&r2=1.158
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1037&r2=1.1038
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7649
retrieving revision 1.7650
diff -u -b -r1.7649 -r1.7650
--- ChangeLog 15 Jul 2009 08:25:02 -0000 1.7649
+++ ChangeLog 16 Jul 2009 01:24:00 -0000 1.7650
@@ -1,3 +1,10 @@
+2009-07-16 Chong Yidong <address@hidden>
+
+ * 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.
+
2009-07-15 YAMAMOTO Mitsuharu <address@hidden>
* nsfont.m (nsfont_draw): Remove code for stippling, which actually
Index: gtkutil.c
===================================================================
RCS file: /sources/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- gtkutil.c 2 Jul 2009 12:27:25 -0000 1.157
+++ gtkutil.c 16 Jul 2009 01:24:01 -0000 1.158
@@ -3827,6 +3827,8 @@
/* Update the tool bar for frame F. Add new buttons and remove old. */
+extern Lisp_Object Qx_gtk_map_stock;
+
void
update_frame_tool_bar (f)
FRAME_PTR f;
@@ -3878,7 +3880,6 @@
for (i = 0; i < f->n_tool_bar_items; ++i)
{
-
int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
int idx;
@@ -3893,7 +3894,6 @@
Lisp_Object rtl;
GtkWidget *wbutton = NULL;
GtkWidget *weventbox;
- Lisp_Object func = intern ("x-gtk-map-stock");
Lisp_Object specified_file;
ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i);
@@ -3914,10 +3914,10 @@
}
specified_file = file_for_image (image);
- if (!NILP (specified_file) && EQ (Qt, Ffboundp (func)))
- stock = call1 (func, specified_file);
+ if (!NILP (specified_file) && !NILP (Ffboundp (Qx_gtk_map_stock)))
+ stock = call1 (Qx_gtk_map_stock, specified_file);
- if (! NILP (stock) && STRINGP (stock))
+ if (STRINGP (stock))
{
stock_name = SSDATA (stock);
if (stock_name[0] == 'n' && stock_name[1] == ':')
Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.1037
retrieving revision 1.1038
diff -u -b -r1.1037 -r1.1038
--- xterm.c 7 Jul 2009 08:38:45 -0000 1.1037
+++ xterm.c 16 Jul 2009 01:24:02 -0000 1.1038
@@ -323,6 +323,9 @@
#ifdef USE_GTK
/* The name of the Emacs icon file. */
static Lisp_Object xg_default_icon_file;
+
+/* Used in gtkutil.c. */
+Lisp_Object Qx_gtk_map_stock;
#endif
/* Used in x_flush. */
@@ -10788,6 +10791,9 @@
#ifdef USE_GTK
xg_default_icon_file = build_string
("icons/hicolor/scalable/apps/emacs.svg");
staticpro (&xg_default_icon_file);
+
+ Qx_gtk_map_stock = intern ("x-gtk-map-stock");
+ staticpro (&Qx_gtk_map_stock);
#endif
DEFVAR_BOOL ("x-use-underline-position-properties",