aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2012-08-14 10:06:07 +0200
committerAndreas Schwab2012-08-14 10:06:07 +0200
commit67b77c0b2ffe38b4e747708821dc2cfa215551a2 (patch)
tree0315ab7173ad235d83769762866dcea02b9f8b9d /src
parenta9f6f311c7ef2c36bb020d808b036f6f40e58237 (diff)
downloademacs-67b77c0b2ffe38b4e747708821dc2cfa215551a2.tar.gz
emacs-67b77c0b2ffe38b4e747708821dc2cfa215551a2.zip
* gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gtkutil.c6
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 @@
12012-08-14 Andreas Schwab <schwab@linux-m68k.org>
2
3 * gtkutil.c (find_rtl_image, update_frame_tool_bar): Use NILP.
4
12012-08-14 Gergely Risko <gergely@risko.hu> 52012-08-14 Gergely Risko <gergely@risko.hu>
2 6
3 * coding.c (decode_coding): Record buffer modification before 7 * 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)
4306 { 4306 {
4307 file = call1 (intern ("file-name-sans-extension"), 4307 file = call1 (intern ("file-name-sans-extension"),
4308 Ffile_name_nondirectory (file)); 4308 Ffile_name_nondirectory (file));
4309 if (EQ (Fequal (file, rtl_name), Qt)) 4309 if (! NILP (Fequal (file, rtl_name)))
4310 { 4310 {
4311 image = rtl_image; 4311 image = rtl_image;
4312 break; 4312 break;
@@ -4583,8 +4583,8 @@ update_frame_tool_bar (FRAME_PTR f)
4583 && tbinfo->n_last_items == f->n_tool_bar_items 4583 && tbinfo->n_last_items == f->n_tool_bar_items
4584 && tbinfo->hmargin == hmargin && tbinfo->vmargin == vmargin 4584 && tbinfo->hmargin == hmargin && tbinfo->vmargin == vmargin
4585 && tbinfo->dir == dir 4585 && tbinfo->dir == dir
4586 && EQ (Fequal (tbinfo->style, style), Qt) 4586 && ! NILP (Fequal (tbinfo->style, style))
4587 && EQ (Fequal (tbinfo->last_tool_bar, f->tool_bar_items), Qt)) 4587 && ! NILP (Fequal (tbinfo->last_tool_bar, f->tool_bar_items)))
4588 { 4588 {
4589 UNBLOCK_INPUT; 4589 UNBLOCK_INPUT;
4590 return; 4590 return;