summaryrefslogtreecommitdiff
path: root/src/lisp.h
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-08-13 13:41:28 +0000
committerMiles Bader <miles@gnu.org>2007-08-13 13:41:28 +0000
commit37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (patch)
tree7fb68e80f66e55100c48b9751cf70c74af2d4bf1 /src/lisp.h
parent031b6333283be57d971e557b83da31c6be937b0a (diff)
parent9d2db4c6637fe37d75f947063bcb2ecce319a1bc (diff)
downloademacs-37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53.tar.gz
emacs-37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53.tar.bz2
emacs-37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53.zip
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h
index d86fdc0e915..c5d9724e96c 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) \