Mercurial > hg > xemacs-beta
diff src/toolbar.c @ 14:9ee227acff29 r19-15b90
Import from CVS: tag r19-15b90
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 08:48:42 +0200 |
| parents | bcdc7deadc19 |
| children | 859a2309aef8 |
line wrap: on
line diff
--- a/src/toolbar.c Mon Aug 13 08:48:18 2007 +0200 +++ b/src/toolbar.c Mon Aug 13 08:48:42 2007 +0200 @@ -1691,30 +1691,38 @@ 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 - elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); + 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 - set_specifier_fallback (Vdefault_toolbar_height, elt); + if (!EQ(elt, Qnil)) + set_specifier_fallback (Vdefault_toolbar_height, elt); elt = Qnil; #ifdef HAVE_TTY 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 - elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); + 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 - set_specifier_fallback (Vdefault_toolbar_width, elt); + if (!EQ(elt, Qnil)) + set_specifier_fallback (Vdefault_toolbar_width, elt); set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); elt = list1 (Fcons (Qnil, Qzero));