Mercurial > hg > xemacs-beta
comparison src/toolbar.c @ 120:cca96a509cfe r20-1b12
Import from CVS: tag r20-1b12
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:25:29 +0200 |
parents | 1ce6082ce73f |
children | 8eaf7971accc |
comparison
equal
deleted
inserted
replaced
119:d101af7320b8 | 120:cca96a509cfe |
---|---|
1678 if (!EQ(elt, Qnil)) | 1678 if (!EQ(elt, Qnil)) |
1679 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); | 1679 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); |
1680 else | 1680 else |
1681 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT))); | 1681 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT))); |
1682 #endif | 1682 #endif |
1683 #ifdef HAVE_NEXTSTEP | |
1684 if (!EQ(elt, Qnil)) | |
1685 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); | |
1686 else | |
1687 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT))); | |
1688 #endif | |
1689 if (!EQ(elt, Qnil)) | 1683 if (!EQ(elt, Qnil)) |
1690 set_specifier_fallback (Vdefault_toolbar_height, elt); | 1684 set_specifier_fallback (Vdefault_toolbar_height, elt); |
1691 | 1685 |
1692 elt = Qnil; | 1686 elt = Qnil; |
1693 #ifdef HAVE_TTY | 1687 #ifdef HAVE_TTY |
1696 #ifdef HAVE_X_WINDOWS | 1690 #ifdef HAVE_X_WINDOWS |
1697 if (!EQ(elt, Qnil)) | 1691 if (!EQ(elt, Qnil)) |
1698 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); | 1692 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); |
1699 else | 1693 else |
1700 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH))); | 1694 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH))); |
1701 #endif | |
1702 #ifdef HAVE_NEXTSTEP | |
1703 if (!EQ(elt, Qnil)) | |
1704 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); | |
1705 else | |
1706 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH))); | |
1707 #endif | 1695 #endif |
1708 if (!EQ(elt, Qnil)) | 1696 if (!EQ(elt, Qnil)) |
1709 set_specifier_fallback (Vdefault_toolbar_width, elt); | 1697 set_specifier_fallback (Vdefault_toolbar_width, elt); |
1710 | 1698 |
1711 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); | 1699 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); |