aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-04-26 16:02:55 +0200
committerJuanma Barranquero2011-04-26 16:02:55 +0200
commit895009e16a18945a539984d7679383d3541a12d5 (patch)
treee3c1c16aa2fc1b0bc33df3776fc03edd99aaac09 /src
parentd4aa710a1577e9d00f0ed2afdcfc799719d614a0 (diff)
downloademacs-895009e16a18945a539984d7679383d3541a12d5.tar.gz
emacs-895009e16a18945a539984d7679383d3541a12d5.zip
src/keyboard.c (QCrtl): Rename from Qrtl. All uses changed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/keyboard.c6
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c91ed1dc74a..82a50ef1884 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-04-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * keyboard.c (QCrtl): Rename from Qrtl. All uses changed.
4
12011-04-26 Teodor Zlatanov <tzz@lifelogs.com> 52011-04-26 Teodor Zlatanov <tzz@lifelogs.com>
2 6
3 * gnutls.c (emacs_gnutls_handshake): Return an error if we're not 7 * gnutls.c (emacs_gnutls_handshake): Return an error if we're not
@@ -7,7 +11,7 @@
72011-04-26 Daniel Colascione <dan.colascione@gmail.com> 112011-04-26 Daniel Colascione <dan.colascione@gmail.com>
8 12
9 * lisp.h (Qdebug): List symbol. 13 * lisp.h (Qdebug): List symbol.
10 * eval.c (Qdebug): restore global linkage. 14 * eval.c (Qdebug): Restore global linkage.
11 * keyboard.c (debug-on-event): New variable. 15 * keyboard.c (debug-on-event): New variable.
12 (handle_user_signal): Break into debugger when debug-on-event 16 (handle_user_signal): Break into debugger when debug-on-event
13 matches the current signal symbol. 17 matches the current signal symbol.
@@ -2530,7 +2534,7 @@
2530 Call gdk_x11_window_lookup_for_display. 2534 Call gdk_x11_window_lookup_for_display.
2531 (xg_set_widget_bg): New function. 2535 (xg_set_widget_bg): New function.
2532 (delete_cb): New function. 2536 (delete_cb): New function.
2533 (xg_create_frame_widgets): connect delete-event to delete_cb. 2537 (xg_create_frame_widgets): Connect delete-event to delete_cb.
2534 Call xg_set_widget_bg. Only set backgrund pixmap for ! HAVE_GTK3 2538 Call xg_set_widget_bg. Only set backgrund pixmap for ! HAVE_GTK3
2535 (xg_set_background_color): Call xg_set_widget_bg. 2539 (xg_set_background_color): Call xg_set_widget_bg.
2536 (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask. 2540 (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
diff --git a/src/keyboard.c b/src/keyboard.c
index 11cdeaf469c..99e7a423cda 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7923,7 +7923,7 @@ static int ntool_bar_items;
7923/* The symbols `:image' and `:rtl'. */ 7923/* The symbols `:image' and `:rtl'. */
7924 7924
7925static Lisp_Object QCimage; 7925static Lisp_Object QCimage;
7926static Lisp_Object Qrtl; 7926static Lisp_Object QCrtl;
7927 7927
7928/* Function prototypes. */ 7928/* Function prototypes. */
7929 7929
@@ -8240,7 +8240,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
8240 /* Value is either a single image specification or a vector 8240 /* Value is either a single image specification or a vector
8241 of 4 such specifications for the different button states. */ 8241 of 4 such specifications for the different button states. */
8242 PROP (TOOL_BAR_ITEM_IMAGES) = value; 8242 PROP (TOOL_BAR_ITEM_IMAGES) = value;
8243 else if (EQ (ikey, Qrtl)) 8243 else if (EQ (ikey, QCrtl))
8244 /* ':rtl STRING' */ 8244 /* ':rtl STRING' */
8245 PROP (TOOL_BAR_ITEM_RTL_IMAGE) = value; 8245 PROP (TOOL_BAR_ITEM_RTL_IMAGE) = value;
8246 } 8246 }
@@ -11475,7 +11475,7 @@ syms_of_keyboard (void)
11475 /* Tool-bars. */ 11475 /* Tool-bars. */
11476 DEFSYM (QCimage, ":image"); 11476 DEFSYM (QCimage, ":image");
11477 DEFSYM (Qhelp_echo, "help-echo"); 11477 DEFSYM (Qhelp_echo, "help-echo");
11478 DEFSYM (Qrtl, ":rtl"); 11478 DEFSYM (QCrtl, ":rtl");
11479 11479
11480 staticpro (&item_properties); 11480 staticpro (&item_properties);
11481 item_properties = Qnil; 11481 item_properties = Qnil;