Mercurial > hg > xemacs-beta
diff src/toolbar.c @ 78:c7528f8e288d r20-0b34
Import from CVS: tag r20-0b34
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:05:42 +0200 |
| parents | 131b0175ea99 |
| children | 1ce6082ce73f |
line wrap: on
line diff
--- a/src/toolbar.c Mon Aug 13 09:05:11 2007 +0200 +++ b/src/toolbar.c Mon Aug 13 09:05:42 2007 +0200 @@ -1669,22 +1669,44 @@ 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 - elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); + if (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 (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 (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 - elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); + if (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 (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 (elt != Qnil) + set_specifier_fallback (Vdefault_toolbar_width, elt); set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); elt = list1 (Fcons (Qnil, Qzero));