Mercurial > hg > xemacs-beta
diff src/toolbar.c @ 12:bcdc7deadc19 r19-15b7
Import from CVS: tag r19-15b7
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 08:48:16 +0200 |
| parents | ac2d302a0011 |
| children | 9ee227acff29 |
line wrap: on
line diff
--- a/src/toolbar.c Mon Aug 13 08:47:56 2007 +0200 +++ b/src/toolbar.c Mon Aug 13 08:48:16 2007 +0200 @@ -1685,17 +1685,31 @@ 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); #endif 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);