[Emacs-diffs] /srv/bzr/emacs/trunk r109598: * gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP.

[Andreas Schwab]

------------------------------------------------------------
revno: 109598
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2012-08-14 10:06:07 +0200
message:
  * gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-14 05:09:35 +0000
+++ b/src/ChangeLog     2012-08-14 08:06:07 +0000
@@ -1,3 +1,7 @@
+2012-08-14  Andreas Schwab  <address@hidden>
+
+       * gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP.
+
 2012-08-14  Gergely Risko  <address@hidden>
 
        * coding.c (decode_coding): Record buffer modification before

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-08-14 04:47:05 +0000
+++ b/src/gtkutil.c     2012-08-14 08:06:07 +0000
@@ -4306,7 +4306,7 @@
         {
           file = call1 (intern ("file-name-sans-extension"),
                        Ffile_name_nondirectory (file));
-          if (EQ (Fequal (file, rtl_name), Qt))
+          if (! NILP (Fequal (file, rtl_name)))
             {
               image = rtl_image;
               break;
@@ -4583,8 +4583,8 @@
       && tbinfo->n_last_items == f->n_tool_bar_items
       && tbinfo->hmargin == hmargin && tbinfo->vmargin == vmargin
       && tbinfo->dir == dir
-      && EQ (Fequal (tbinfo->style, style), Qt)
-      && EQ (Fequal (tbinfo->last_tool_bar, f->tool_bar_items), Qt))
+      && ! NILP (Fequal (tbinfo->style, style))
+      && ! NILP (Fequal (tbinfo->last_tool_bar, f->tool_bar_items)))
     {
       UNBLOCK_INPUT;
       return;