Mercurial > hg > xemacs-beta

diff src/toolbar.c @ 245:51092a27c943 r20-5b21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b21
author cvs
date Mon, 13 Aug 2007 10:17:54 +0200
parents 1f0dabaa0855
children 83b3d10dcba9
line wrap: on
line diff
--- a/src/toolbar.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/toolbar.c	Mon Aug 13 10:17:54 2007 +0200
@@ -446,7 +446,7 @@
 
       /* We know that we at least have an up_glyph.  Well, no, we
          don't.  The user may have changed the button glyph on us. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->up_glyph))
 	    {
@@ -459,7 +459,7 @@
 	tb->up_glyph = Qnil;
 
       /* We might have a down_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->down_glyph))
 	    {
@@ -472,7 +472,7 @@
 	tb->down_glyph = Qnil;
 
       /* We might have a disabled_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->disabled_glyph))
 	    {
@@ -485,7 +485,7 @@
 	tb->disabled_glyph = Qnil;
 
       /* We might have a cap_up_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->cap_up_glyph))
 	    {
@@ -498,7 +498,7 @@
 	tb->cap_up_glyph = Qnil;
 
       /* We might have a cap_down_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->cap_down_glyph))
 	    {
@@ -511,7 +511,7 @@
 	tb->cap_down_glyph = Qnil;
 
       /* We might have a cap_disabled_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->cap_disabled_glyph))
 	    {