From 895009e16a18945a539984d7679383d3541a12d5 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 26 Apr 2011 16:02:55 +0200 Subject: [PATCH] src/keyboard.c (QCrtl): Rename from Qrtl. All uses changed. --- src/ChangeLog | 8 ++++++-- src/keyboard.c | 6 +++--- 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 @@ +2011-04-26 Juanma Barranquero + + * keyboard.c (QCrtl): Rename from Qrtl. All uses changed. + 2011-04-26 Teodor Zlatanov * gnutls.c (emacs_gnutls_handshake): Return an error if we're not @@ -7,7 +11,7 @@ 2011-04-26 Daniel Colascione * lisp.h (Qdebug): List symbol. - * eval.c (Qdebug): restore global linkage. + * eval.c (Qdebug): Restore global linkage. * keyboard.c (debug-on-event): New variable. (handle_user_signal): Break into debugger when debug-on-event matches the current signal symbol. @@ -2530,7 +2534,7 @@ Call gdk_x11_window_lookup_for_display. (xg_set_widget_bg): New function. (delete_cb): New function. - (xg_create_frame_widgets): connect delete-event to delete_cb. + (xg_create_frame_widgets): Connect delete-event to delete_cb. Call xg_set_widget_bg. Only set backgrund pixmap for ! HAVE_GTK3 (xg_set_background_color): Call xg_set_widget_bg. (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; /* The symbols `:image' and `:rtl'. */ static Lisp_Object QCimage; -static Lisp_Object Qrtl; +static Lisp_Object QCrtl; /* Function prototypes. */ @@ -8240,7 +8240,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item) /* Value is either a single image specification or a vector of 4 such specifications for the different button states. */ PROP (TOOL_BAR_ITEM_IMAGES) = value; - else if (EQ (ikey, Qrtl)) + else if (EQ (ikey, QCrtl)) /* ':rtl STRING' */ PROP (TOOL_BAR_ITEM_RTL_IMAGE) = value; } @@ -11475,7 +11475,7 @@ syms_of_keyboard (void) /* Tool-bars. */ DEFSYM (QCimage, ":image"); DEFSYM (Qhelp_echo, "help-echo"); - DEFSYM (Qrtl, ":rtl"); + DEFSYM (QCrtl, ":rtl"); staticpro (&item_properties); item_properties = Qnil; -- 2.39.2