Mercurial > hg > xemacs-beta
diff src/toolbar.c @ 80:1ce6082ce73f r20-0b90
Import from CVS: tag r20-0b90
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:06:37 +0200 |
| parents | c7528f8e288d |
| children | cca96a509cfe |
line wrap: on
line diff
--- a/src/toolbar.c Mon Aug 13 09:05:44 2007 +0200 +++ b/src/toolbar.c Mon Aug 13 09:06:37 2007 +0200 @@ -1675,18 +1675,18 @@ elt = list1 (Fcons (list1 (Qtty), Qzero)); #endif #ifdef HAVE_X_WINDOWS - if (elt != Qnil) + if (!EQ(elt, Qnil)) elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); else elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT))); #endif #ifdef HAVE_NEXTSTEP - if (elt != Qnil) + if (!EQ(elt, Qnil)) elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); else elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT))); #endif - if (elt != Qnil) + if (!EQ(elt, Qnil)) set_specifier_fallback (Vdefault_toolbar_height, elt); elt = Qnil; @@ -1694,18 +1694,18 @@ elt = list1 (Fcons (list1 (Qtty), Qzero)); #endif #ifdef HAVE_X_WINDOWS - if (elt != Qnil) + if (!EQ(elt, Qnil)) elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); else elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH))); #endif #ifdef HAVE_NEXTSTEP - if (elt != Qnil) + if (!EQ(elt, Qnil)) elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); else elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH))); #endif - if (elt != Qnil) + if (!EQ(elt, Qnil)) set_specifier_fallback (Vdefault_toolbar_width, elt); set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height);