comparison src/lisp.h @ 83652:5b644ae74c91

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 846-851) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 88-92) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 242-244) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
author Miles Bader <miles@gnu.org>
date Mon, 13 Aug 2007 13:51:08 +0000
parents 65663fcd2caa e5a68f18fcb9
children b97a348dd7c7
comparison
equal deleted inserted replaced
83651:47230f3f349b 83652:5b644ae74c91
1442 /* Slower versions that test the frame type first. */ 1442 /* Slower versions that test the frame type first. */
1443 #define MAKE_GLYPH(f, char, face) (FAST_MAKE_GLYPH (char, face)) 1443 #define MAKE_GLYPH(f, char, face) (FAST_MAKE_GLYPH (char, face))
1444 #define GLYPH_CHAR(f, g) (FAST_GLYPH_CHAR (g)) 1444 #define GLYPH_CHAR(f, g) (FAST_GLYPH_CHAR (g))
1445 #define GLYPH_FACE(f, g) (FAST_GLYPH_FACE (g)) 1445 #define GLYPH_FACE(f, g) (FAST_GLYPH_FACE (g))
1446 1446
1447 /* Return 1 iff GLYPH contains valid character code. */ 1447 /* Return 1 if GLYPH contains valid character code. */
1448 #define GLYPH_CHAR_VALID_P(glyph) CHAR_VALID_P (FAST_GLYPH_CHAR (glyph), 1) 1448 #define GLYPH_CHAR_VALID_P(glyph) CHAR_VALID_P (FAST_GLYPH_CHAR (glyph), 1)
1449 1449
1450 /* The ID of the mode line highlighting face. */ 1450 /* The ID of the mode line highlighting face. */
1451 #define GLYPH_MODE_LINE_FACE 1 1451 #define GLYPH_MODE_LINE_FACE 1
1452 1452
1589 1589
1590 /* This macro rejects windows on the interior of the window tree as 1590 /* This macro rejects windows on the interior of the window tree as
1591 "dead", which is what we want; this is an argument-checking macro, and 1591 "dead", which is what we want; this is an argument-checking macro, and
1592 the user should never get access to interior windows. 1592 the user should never get access to interior windows.
1593 1593
1594 A window of any sort, leaf or interior, is dead iff the buffer, 1594 A window of any sort, leaf or interior, is dead if the buffer,
1595 vchild, and hchild members are all nil. */ 1595 vchild, and hchild members are all nil. */
1596 1596
1597 #define CHECK_LIVE_WINDOW(x) \ 1597 #define CHECK_LIVE_WINDOW(x) \
1598 CHECK_TYPE (WINDOWP (x) && !NILP (XWINDOW (x)->buffer), Qwindow_live_p, x) 1598 CHECK_TYPE (WINDOWP (x) && !NILP (XWINDOW (x)->buffer), Qwindow_live_p, x)
1599 1599