Mercurial > hg > xemacs-beta
diff src/toolbar.c @ 70:131b0175ea99 r20-0b30
Import from CVS: tag r20-0b30
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:02:59 +0200 |
| parents | 859a2309aef8 |
| children | c7528f8e288d |
line wrap: on
line diff
--- a/src/toolbar.c Mon Aug 13 09:00:04 2007 +0200 +++ b/src/toolbar.c Mon Aug 13 09:02:59 2007 +0200 @@ -1669,44 +1669,22 @@ toolbar_size_changed_in_frame); /* #### this is ugly. */ - /* sb - even uglier to make this work without console tty support, ugh. */ - elt = Qnil; -#ifdef HAVE_TTY elt = list1 (Fcons (list1 (Qtty), Qzero)); -#endif #ifdef HAVE_X_WINDOWS - 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))); + elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); #endif #ifdef HAVE_NEXTSTEP - 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))); + elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); #endif - if (!EQ(elt, Qnil)) - set_specifier_fallback (Vdefault_toolbar_height, elt); - - elt = Qnil; -#ifdef HAVE_TTY + set_specifier_fallback (Vdefault_toolbar_height, elt); elt = list1 (Fcons (list1 (Qtty), Qzero)); -#endif #ifdef HAVE_X_WINDOWS - 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))); + elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); #endif #ifdef HAVE_NEXTSTEP - 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))); + elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); #endif - if (!EQ(elt, Qnil)) - set_specifier_fallback (Vdefault_toolbar_width, elt); + set_specifier_fallback (Vdefault_toolbar_width, elt); set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); elt = list1 (Fcons (Qnil, Qzero));