From 67b77c0b2ffe38b4e747708821dc2cfa215551a2 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 14 Aug 2012 10:06:07 +0200 Subject: [PATCH] * gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP. --- src/ChangeLog | 4 ++++ src/gtkutil.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e622d95bff8..eef02da44e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-08-14 Andreas Schwab + + * gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP. + 2012-08-14 Gergely Risko * coding.c (decode_coding): Record buffer modification before diff --git a/src/gtkutil.c b/src/gtkutil.c index e538c358069..55f5639fdb7 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -4306,7 +4306,7 @@ find_rtl_image (FRAME_PTR f, Lisp_Object image, Lisp_Object rtl) { 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 @@ update_frame_tool_bar (FRAME_PTR f) && 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; -- 2.39.2