Mercurial > hg > xemacs-beta

comparison src/toolbar.c @ 14:9ee227acff29 r19-15b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents bcdc7deadc19
children 859a2309aef8
comparison
equal deleted inserted replaced
13:13c6d0aaafe5 14:9ee227acff29
1689 elt = Qnil; 1689 elt = Qnil;
1690 #ifdef HAVE_TTY 1690 #ifdef HAVE_TTY
1691 elt = list1 (Fcons (list1 (Qtty), Qzero)); 1691 elt = list1 (Fcons (list1 (Qtty), Qzero));
1692 #endif 1692 #endif
1693 #ifdef HAVE_X_WINDOWS 1693 #ifdef HAVE_X_WINDOWS
1694 if (elt != Qnil) 1694 if (!EQ(elt, Qnil))
1695 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); 1695 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt);
1696 else 1696 else
1697 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT))); 1697 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)));
1698 #endif 1698 #endif
1699 #ifdef HAVE_NEXTSTEP 1699 #ifdef HAVE_NEXTSTEP
1700 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); 1700 if (!EQ(elt, Qnil))
1701 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt);
1702 else
1703 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)));
1701 #endif 1704 #endif
1702 set_specifier_fallback (Vdefault_toolbar_height, elt); 1705 if (!EQ(elt, Qnil))
1706 set_specifier_fallback (Vdefault_toolbar_height, elt);
1703 1707
1704 elt = Qnil; 1708 elt = Qnil;
1705 #ifdef HAVE_TTY 1709 #ifdef HAVE_TTY
1706 elt = list1 (Fcons (list1 (Qtty), Qzero)); 1710 elt = list1 (Fcons (list1 (Qtty), Qzero));
1707 #endif 1711 #endif
1708 #ifdef HAVE_X_WINDOWS 1712 #ifdef HAVE_X_WINDOWS
1709 if (elt != Qnil) 1713 if (!EQ(elt, Qnil))
1710 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); 1714 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt);
1711 else 1715 else
1712 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH))); 1716 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)));
1713 #endif 1717 #endif
1714 #ifdef HAVE_NEXTSTEP 1718 #ifdef HAVE_NEXTSTEP
1715 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); 1719 if (!EQ(elt, Qnil))
1720 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt);
1721 else
1722 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)));
1716 #endif 1723 #endif
1717 set_specifier_fallback (Vdefault_toolbar_width, elt); 1724 if (!EQ(elt, Qnil))
1725 set_specifier_fallback (Vdefault_toolbar_width, elt);
1718 1726
1719 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); 1727 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height);
1720 elt = list1 (Fcons (Qnil, Qzero)); 1728 elt = list1 (Fcons (Qnil, Qzero));
1721 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], elt); 1729 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], elt);
1722 set_specifier_fallback (Vtoolbar_size[LEFT_TOOLBAR], elt); 1730 set_specifier_fallback (Vtoolbar_size[LEFT_TOOLBAR], elt);