diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-13 13:51:08 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-13 13:51:08 +0000 |
| commit | aaf34461ff5804e5cebe163b31e535da72e81d87 (patch) | |
| tree | b096310b459b78e437f08ac0f1f00954840a5db5 /src/lisp.h | |
| parent | 61d032dfd91b811d59acd7605ac02758be97e912 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.tar.gz emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.tar.bz2 emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.zip | |
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
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h index 6dee6e0a7d4..2273015d643 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1444,7 +1444,7 @@ typedef unsigned char UCHAR; #define GLYPH_CHAR(f, g) (FAST_GLYPH_CHAR (g)) #define GLYPH_FACE(f, g) (FAST_GLYPH_FACE (g)) -/* Return 1 iff GLYPH contains valid character code. */ +/* Return 1 if GLYPH contains valid character code. */ #define GLYPH_CHAR_VALID_P(glyph) CHAR_VALID_P (FAST_GLYPH_CHAR (glyph), 1) /* The ID of the mode line highlighting face. */ @@ -1591,7 +1591,7 @@ typedef unsigned char UCHAR; "dead", which is what we want; this is an argument-checking macro, and the user should never get access to interior windows. - A window of any sort, leaf or interior, is dead iff the buffer, + A window of any sort, leaf or interior, is dead if the buffer, vchild, and hchild members are all nil. */ #define CHECK_LIVE_WINDOW(x) \ |