diff options
| author | Glenn Morris | 2007-08-08 07:49:21 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-08-08 07:49:21 +0000 |
| commit | e0f24100c74828aadd926f0afa6e3440be8c89d0 (patch) | |
| tree | 3fb96e2684078c6612126ecc1d668fd87866a041 /src | |
| parent | 22e9fe2445883d651799f027917cd50d065f200d (diff) | |
| download | emacs-e0f24100c74828aadd926f0afa6e3440be8c89d0.tar.gz emacs-e0f24100c74828aadd926f0afa6e3440be8c89d0.zip | |
Replace `iff' in comments.
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer.h | 2 | ||||
| -rw-r--r-- | src/callproc.c | 2 | ||||
| -rw-r--r-- | src/casetab.c | 2 | ||||
| -rw-r--r-- | src/category.c | 2 | ||||
| -rw-r--r-- | src/ccl.c | 4 | ||||
| -rw-r--r-- | src/charset.c | 6 | ||||
| -rw-r--r-- | src/charset.h | 10 | ||||
| -rw-r--r-- | src/coding.h | 4 | ||||
| -rw-r--r-- | src/composite.h | 4 | ||||
| -rw-r--r-- | src/dired.c | 2 | ||||
| -rw-r--r-- | src/editfns.c | 2 | ||||
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/fontset.c | 2 | ||||
| -rw-r--r-- | src/fontset.h | 2 | ||||
| -rw-r--r-- | src/getloadavg.c | 2 | ||||
| -rw-r--r-- | src/indent.c | 2 | ||||
| -rw-r--r-- | src/indent.h | 2 | ||||
| -rw-r--r-- | src/intervals.c | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 4 | ||||
| -rw-r--r-- | src/keyboard.h | 2 | ||||
| -rw-r--r-- | src/keymap.c | 2 | ||||
| -rw-r--r-- | src/lisp.h | 4 | ||||
| -rw-r--r-- | src/lread.c | 6 | ||||
| -rw-r--r-- | src/macterm.c | 2 | ||||
| -rw-r--r-- | src/macterm.h | 2 | ||||
| -rw-r--r-- | src/msdos.c | 2 | ||||
| -rw-r--r-- | src/process.c | 12 | ||||
| -rw-r--r-- | src/process.h | 2 | ||||
| -rw-r--r-- | src/regex.c | 2 | ||||
| -rw-r--r-- | src/search.c | 2 | ||||
| -rw-r--r-- | src/systime.h | 4 | ||||
| -rw-r--r-- | src/systty.h | 2 | ||||
| -rw-r--r-- | src/termhooks.h | 2 | ||||
| -rw-r--r-- | src/textprop.c | 4 | ||||
| -rw-r--r-- | src/w32term.c | 2 | ||||
| -rw-r--r-- | src/w32term.h | 2 | ||||
| -rw-r--r-- | src/window.h | 2 | ||||
| -rw-r--r-- | src/xterm.c | 2 | ||||
| -rw-r--r-- | src/xterm.h | 2 |
40 files changed, 60 insertions, 60 deletions
diff --git a/src/buffer.h b/src/buffer.h index 65cfef4f04f..ed99dc4ffb1 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -561,7 +561,7 @@ struct buffer | |||
| 561 | Lisp_Object filename; | 561 | Lisp_Object filename; |
| 562 | /* Dir for expanding relative file names. */ | 562 | /* Dir for expanding relative file names. */ |
| 563 | Lisp_Object directory; | 563 | Lisp_Object directory; |
| 564 | /* True iff this buffer has been backed up (if you write to the | 564 | /* True if this buffer has been backed up (if you write to the |
| 565 | visited file and it hasn't been backed up, then a backup will | 565 | visited file and it hasn't been backed up, then a backup will |
| 566 | be made). */ | 566 | be made). */ |
| 567 | /* This isn't really used by the C code, so could be deleted. */ | 567 | /* This isn't really used by the C code, so could be deleted. */ |
diff --git a/src/callproc.c b/src/callproc.c index 1ea0dfa43a6..bf7ea43b868 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -117,7 +117,7 @@ Lisp_Object Vprocess_environment; | |||
| 117 | Lisp_Object Qbuffer_file_type; | 117 | Lisp_Object Qbuffer_file_type; |
| 118 | #endif /* DOS_NT */ | 118 | #endif /* DOS_NT */ |
| 119 | 119 | ||
| 120 | /* True iff we are about to fork off a synchronous process or if we | 120 | /* True if we are about to fork off a synchronous process or if we |
| 121 | are waiting for it. */ | 121 | are waiting for it. */ |
| 122 | int synch_process_alive; | 122 | int synch_process_alive; |
| 123 | 123 | ||
diff --git a/src/casetab.c b/src/casetab.c index 1d364a6df7e..a53bb1ece52 100644 --- a/src/casetab.c +++ b/src/casetab.c | |||
| @@ -40,7 +40,7 @@ static void set_identity (); | |||
| 40 | static void shuffle (); | 40 | static void shuffle (); |
| 41 | 41 | ||
| 42 | DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0, | 42 | DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0, |
| 43 | doc: /* Return t iff OBJECT is a case table. | 43 | doc: /* Return t if OBJECT is a case table. |
| 44 | See `set-case-table' for more information on these data structures. */) | 44 | See `set-case-table' for more information on these data structures. */) |
| 45 | (object) | 45 | (object) |
| 46 | Lisp_Object object; | 46 | Lisp_Object object; |
diff --git a/src/category.c b/src/category.c index 55e752045e7..7ea9b7810fa 100644 --- a/src/category.c +++ b/src/category.c | |||
| @@ -559,7 +559,7 @@ syms_of_category () | |||
| 559 | doc: /* List of pair (cons) of categories to determine word boundary. | 559 | doc: /* List of pair (cons) of categories to determine word boundary. |
| 560 | 560 | ||
| 561 | Emacs treats a sequence of word constituent characters as a single | 561 | Emacs treats a sequence of word constituent characters as a single |
| 562 | word (i.e. finds no word boundary between them) iff they belongs to | 562 | word (i.e. finds no word boundary between them) only if they belong to |
| 563 | the same charset. But, exceptions are allowed in the following cases. | 563 | the same charset. But, exceptions are allowed in the following cases. |
| 564 | 564 | ||
| 565 | \(1) The case that characters are in different charsets is controlled | 565 | \(1) The case that characters are in different charsets is controlled |
| @@ -659,13 +659,13 @@ while (0) | |||
| 659 | 659 | ||
| 660 | #define CCL_LookupIntConstTbl 0x13 /* Lookup multibyte character by | 660 | #define CCL_LookupIntConstTbl 0x13 /* Lookup multibyte character by |
| 661 | integer key. Afterwards R7 set | 661 | integer key. Afterwards R7 set |
| 662 | to 1 iff lookup succeeded. | 662 | to 1 if lookup succeeded. |
| 663 | 1:ExtendedCOMMNDRrrRRRXXXXXXXX | 663 | 1:ExtendedCOMMNDRrrRRRXXXXXXXX |
| 664 | 2:ARGUMENT(Hash table ID) */ | 664 | 2:ARGUMENT(Hash table ID) */ |
| 665 | 665 | ||
| 666 | #define CCL_LookupCharConstTbl 0x14 /* Lookup integer by multibyte | 666 | #define CCL_LookupCharConstTbl 0x14 /* Lookup integer by multibyte |
| 667 | character key. Afterwards R7 set | 667 | character key. Afterwards R7 set |
| 668 | to 1 iff lookup succeeded. | 668 | to 1 if lookup succeeded. |
| 669 | 1:ExtendedCOMMNDRrrRRRrrrXXXXX | 669 | 1:ExtendedCOMMNDRrrRRRrrrXXXXX |
| 670 | 2:ARGUMENT(Hash table ID) */ | 670 | 2:ARGUMENT(Hash table ID) */ |
| 671 | 671 | ||
diff --git a/src/charset.c b/src/charset.c index a6ec309cbb3..1a85cd39c72 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -337,7 +337,7 @@ split_string (str, len, charset, c1, c2) | |||
| 337 | return 0; | 337 | return 0; |
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | /* Return 1 iff character C has valid printable glyph. | 340 | /* Return 1 if character C has valid printable glyph. |
| 341 | Use the macro CHAR_PRINTABLE_P instead. */ | 341 | Use the macro CHAR_PRINTABLE_P instead. */ |
| 342 | int | 342 | int |
| 343 | char_printable_p (c) | 343 | char_printable_p (c) |
| @@ -1102,8 +1102,8 @@ DIMENSION, CHARS, and FINAL-CHAR. */) | |||
| 1102 | return CHARSET_SYMBOL (charset); | 1102 | return CHARSET_SYMBOL (charset); |
| 1103 | } | 1103 | } |
| 1104 | 1104 | ||
| 1105 | /* If GENERICP is nonzero, return nonzero iff C is a valid normal or | 1105 | /* If GENERICP is nonzero, return nonzero if C is a valid normal or |
| 1106 | generic character. If GENERICP is zero, return nonzero iff C is a | 1106 | generic character. If GENERICP is zero, return nonzero if C is a |
| 1107 | valid normal character. Do not call this function directly, | 1107 | valid normal character. Do not call this function directly, |
| 1108 | instead use macro CHAR_VALID_P. */ | 1108 | instead use macro CHAR_VALID_P. */ |
| 1109 | int | 1109 | int |
diff --git a/src/charset.h b/src/charset.h index 984d466d97d..c20766f910b 100644 --- a/src/charset.h +++ b/src/charset.h | |||
| @@ -413,8 +413,8 @@ extern int width_by_char_head[256]; | |||
| 413 | | ((c1) <= 0 ? 0 : (((c1) & 0x7F) << 7)))))) | 413 | | ((c1) <= 0 ? 0 : (((c1) & 0x7F) << 7)))))) |
| 414 | 414 | ||
| 415 | 415 | ||
| 416 | /* If GENERICP is nonzero, return nonzero iff C is a valid normal or | 416 | /* If GENERICP is nonzero, return nonzero if C is a valid normal or |
| 417 | generic character. If GENERICP is zero, return nonzero iff C is a | 417 | generic character. If GENERICP is zero, return nonzero if C is a |
| 418 | valid normal character. */ | 418 | valid normal character. */ |
| 419 | #define CHAR_VALID_P(c, genericp) \ | 419 | #define CHAR_VALID_P(c, genericp) \ |
| 420 | ((c) >= 0 \ | 420 | ((c) >= 0 \ |
| @@ -450,7 +450,7 @@ extern int width_by_char_head[256]; | |||
| 450 | #define VALID_LEADING_CODE_P(code) \ | 450 | #define VALID_LEADING_CODE_P(code) \ |
| 451 | (! NILP (CHARSET_TABLE_ENTRY (code))) | 451 | (! NILP (CHARSET_TABLE_ENTRY (code))) |
| 452 | 452 | ||
| 453 | /* Return 1 iff the byte sequence at unibyte string STR (LENGTH bytes) | 453 | /* Return 1 if the byte sequence at unibyte string STR (LENGTH bytes) |
| 454 | is valid as a multibyte form. If valid, by a side effect, BYTES is | 454 | is valid as a multibyte form. If valid, by a side effect, BYTES is |
| 455 | set to the byte length of the multibyte form. */ | 455 | set to the byte length of the multibyte form. */ |
| 456 | 456 | ||
| @@ -471,7 +471,7 @@ extern int width_by_char_head[256]; | |||
| 471 | && VALID_LEADING_CODE_P (str[1])))))))) | 471 | && VALID_LEADING_CODE_P (str[1])))))))) |
| 472 | 472 | ||
| 473 | 473 | ||
| 474 | /* Return 1 iff the byte sequence at multibyte string STR is valid as | 474 | /* Return 1 if the byte sequence at multibyte string STR is valid as |
| 475 | a unibyte form. By a side effect, BYTES is set to the byte length | 475 | a unibyte form. By a side effect, BYTES is set to the byte length |
| 476 | of one character at STR. */ | 476 | of one character at STR. */ |
| 477 | 477 | ||
| @@ -499,7 +499,7 @@ extern int width_by_char_head[256]; | |||
| 499 | c1 = CHAR_FIELD3 (c), \ | 499 | c1 = CHAR_FIELD3 (c), \ |
| 500 | c2 = -1))) | 500 | c2 = -1))) |
| 501 | 501 | ||
| 502 | /* Return 1 iff character C has valid printable glyph. */ | 502 | /* Return 1 if character C has valid printable glyph. */ |
| 503 | #define CHAR_PRINTABLE_P(c) (ASCII_BYTE_P (c) || char_printable_p (c)) | 503 | #define CHAR_PRINTABLE_P(c) (ASCII_BYTE_P (c) || char_printable_p (c)) |
| 504 | 504 | ||
| 505 | /* The charset of the character at STR is stored in CHARSET, and the | 505 | /* The charset of the character at STR is stored in CHARSET, and the |
diff --git a/src/coding.h b/src/coding.h index 9906e66af6c..2efcd4f47e2 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -263,7 +263,7 @@ enum coding_type | |||
| 263 | eol-type is not consistent | 263 | eol-type is not consistent |
| 264 | through the file. */ | 264 | through the file. */ |
| 265 | 265 | ||
| 266 | /* 1 iff composing. */ | 266 | /* 1 if composing. */ |
| 267 | #define COMPOSING_P(coding) ((int) coding->composing > (int) COMPOSITION_NO) | 267 | #define COMPOSING_P(coding) ((int) coding->composing > (int) COMPOSITION_NO) |
| 268 | 268 | ||
| 269 | #define COMPOSITION_DATA_SIZE 4080 | 269 | #define COMPOSITION_DATA_SIZE 4080 |
| @@ -372,7 +372,7 @@ struct coding_system | |||
| 372 | /* The current status of composition handling. */ | 372 | /* The current status of composition handling. */ |
| 373 | int composing; | 373 | int composing; |
| 374 | 374 | ||
| 375 | /* 1 iff the next character is a composition rule. */ | 375 | /* 1 if the next character is a composition rule. */ |
| 376 | int composition_rule_follows; | 376 | int composition_rule_follows; |
| 377 | 377 | ||
| 378 | /* Information of compositions are stored here on decoding and set | 378 | /* Information of compositions are stored here on decoding and set |
diff --git a/src/composite.h b/src/composite.h index 5dc8dde62e2..ba8f8c84104 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -56,7 +56,7 @@ enum composition_method { | |||
| 56 | /* Temporary variable used only in the following macros. */ | 56 | /* Temporary variable used only in the following macros. */ |
| 57 | extern Lisp_Object composition_temp; | 57 | extern Lisp_Object composition_temp; |
| 58 | 58 | ||
| 59 | /* Return 1 iff the composition is already registered. */ | 59 | /* Return 1 if the composition is already registered. */ |
| 60 | #define COMPOSITION_REGISTERD_P(prop) INTEGERP (XCAR (prop)) | 60 | #define COMPOSITION_REGISTERD_P(prop) INTEGERP (XCAR (prop)) |
| 61 | 61 | ||
| 62 | /* Return ID number of the already registered composition. */ | 62 | /* Return ID number of the already registered composition. */ |
| @@ -91,7 +91,7 @@ extern Lisp_Object composition_temp; | |||
| 91 | ? COMPOSITION_WITH_ALTCHARS \ | 91 | ? COMPOSITION_WITH_ALTCHARS \ |
| 92 | : COMPOSITION_WITH_RULE_ALTCHARS)))) | 92 | : COMPOSITION_WITH_RULE_ALTCHARS)))) |
| 93 | 93 | ||
| 94 | /* Return 1 iff the composition is valid. It is valid if length of | 94 | /* Return 1 if the composition is valid. It is valid if length of |
| 95 | the composition equals to (END - START). */ | 95 | the composition equals to (END - START). */ |
| 96 | #define COMPOSITION_VALID_P(start, end, prop) \ | 96 | #define COMPOSITION_VALID_P(start, end, prop) \ |
| 97 | (CONSP (prop) \ | 97 | (CONSP (prop) \ |
diff --git a/src/dired.c b/src/dired.c index 22283b66ea0..1fb5387268a 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -916,7 +916,7 @@ Elements of the attribute list are: | |||
| 916 | 7. Size in bytes. | 916 | 7. Size in bytes. |
| 917 | This is a floating point number if the size is too large for an integer. | 917 | This is a floating point number if the size is too large for an integer. |
| 918 | 8. File modes, as a string of ten letters or dashes as in ls -l. | 918 | 8. File modes, as a string of ten letters or dashes as in ls -l. |
| 919 | 9. t iff file's gid would change if file were deleted and recreated. | 919 | 9. t if file's gid would change if file were deleted and recreated. |
| 920 | 10. inode number. If inode number is larger than the Emacs integer, | 920 | 10. inode number. If inode number is larger than the Emacs integer, |
| 921 | this is a cons cell containing two integers: first the high part, | 921 | this is a cons cell containing two integers: first the high part, |
| 922 | then the low 16 bits. | 922 | then the low 16 bits. |
diff --git a/src/editfns.c b/src/editfns.c index 5ab8e5eddc8..6c6742d242e 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3516,7 +3516,7 @@ usage: (format STRING &rest OBJECTS) */) | |||
| 3516 | precision ::= '.' [0-9]* | 3516 | precision ::= '.' [0-9]* |
| 3517 | 3517 | ||
| 3518 | If a field-width is specified, it specifies to which width | 3518 | If a field-width is specified, it specifies to which width |
| 3519 | the output should be padded with blanks, iff the output | 3519 | the output should be padded with blanks, if the output |
| 3520 | string is shorter than field-width. | 3520 | string is shorter than field-width. |
| 3521 | 3521 | ||
| 3522 | If precision is specified, it specifies the number of | 3522 | If precision is specified, it specifies the number of |
diff --git a/src/eval.c b/src/eval.c index 60e3c77a3a3..026a3375589 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1785,7 +1785,7 @@ signal_error (s, arg) | |||
| 1785 | } | 1785 | } |
| 1786 | 1786 | ||
| 1787 | 1787 | ||
| 1788 | /* Return nonzero iff LIST is a non-nil atom or | 1788 | /* Return nonzero if LIST is a non-nil atom or |
| 1789 | a list containing one of CONDITIONS. */ | 1789 | a list containing one of CONDITIONS. */ |
| 1790 | 1790 | ||
| 1791 | static int | 1791 | static int |
diff --git a/src/fileio.c b/src/fileio.c index 1962035e0bd..26723fa4f3e 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -5191,7 +5191,7 @@ This does code conversion according to the value of | |||
| 5191 | * if we do writes that don't end with a carriage return. Furthermore | 5191 | * if we do writes that don't end with a carriage return. Furthermore |
| 5192 | * it cannot handle writes of more then 16K. The modified | 5192 | * it cannot handle writes of more then 16K. The modified |
| 5193 | * version of "sys_write" in SYSDEP.C (see comment there) copes with | 5193 | * version of "sys_write" in SYSDEP.C (see comment there) copes with |
| 5194 | * this EXCEPT for the last record (iff it doesn't end with a carriage | 5194 | * this EXCEPT for the last record (if it doesn't end with a carriage |
| 5195 | * return). This implies that if your buffer doesn't end with a carriage | 5195 | * return). This implies that if your buffer doesn't end with a carriage |
| 5196 | * return, you get one free... tough. However it also means that if | 5196 | * return, you get one free... tough. However it also means that if |
| 5197 | * we make two calls to sys_write (a la the following code) you can | 5197 | * we make two calls to sys_write (a la the following code) you can |
diff --git a/src/fontset.c b/src/fontset.c index bf6f7121b23..b670e228047 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -500,7 +500,7 @@ free_face_fontset (f, face) | |||
| 500 | } | 500 | } |
| 501 | 501 | ||
| 502 | 502 | ||
| 503 | /* Return 1 iff FACE is suitable for displaying character C. | 503 | /* Return 1 if FACE is suitable for displaying character C. |
| 504 | Otherwise return 0. Called from the macro FACE_SUITABLE_FOR_CHAR_P | 504 | Otherwise return 0. Called from the macro FACE_SUITABLE_FOR_CHAR_P |
| 505 | when C is not a single byte character.. */ | 505 | when C is not a single byte character.. */ |
| 506 | 506 | ||
diff --git a/src/fontset.h b/src/fontset.h index 5b5c5cbcfaa..c8bd1e36eab 100644 --- a/src/fontset.h +++ b/src/fontset.h | |||
| @@ -66,7 +66,7 @@ struct font_info | |||
| 66 | /* Average width of glyphs in the font. */ | 66 | /* Average width of glyphs in the font. */ |
| 67 | int average_width; | 67 | int average_width; |
| 68 | 68 | ||
| 69 | /* 1 iff `vertical-centering-font-regexp' matches this font name. | 69 | /* 1 if `vertical-centering-font-regexp' matches this font name. |
| 70 | In this case, we render characters at vartical center positions | 70 | In this case, we render characters at vartical center positions |
| 71 | of lines. */ | 71 | of lines. */ |
| 72 | int vertical_centering; | 72 | int vertical_centering; |
diff --git a/src/getloadavg.c b/src/getloadavg.c index f40149a8c47..6d66cbfd8a1 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c | |||
| @@ -484,7 +484,7 @@ static struct dg_sys_info_load_info load_info; /* what-a-mouthful! */ | |||
| 484 | #if !defined(HAVE_LIBKSTAT) && defined(LOAD_AVE_TYPE) | 484 | #if !defined(HAVE_LIBKSTAT) && defined(LOAD_AVE_TYPE) |
| 485 | /* File descriptor open to /dev/kmem or VMS load ave driver. */ | 485 | /* File descriptor open to /dev/kmem or VMS load ave driver. */ |
| 486 | static int channel; | 486 | static int channel; |
| 487 | /* Nonzero iff channel is valid. */ | 487 | /* Nonzero if channel is valid. */ |
| 488 | static int getloadavg_initialized; | 488 | static int getloadavg_initialized; |
| 489 | /* Offset in kmem to seek to read load average, or 0 means invalid. */ | 489 | /* Offset in kmem to seek to read load average, or 0 means invalid. */ |
| 490 | static long offset; | 490 | static long offset; |
diff --git a/src/indent.c b/src/indent.c index 905cf7559a7..b3c1d0cf81a 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -116,7 +116,7 @@ character_width (c, dp) | |||
| 116 | return 0; | 116 | return 0; |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | /* Return true iff the display table DISPTAB specifies the same widths | 119 | /* Return true if the display table DISPTAB specifies the same widths |
| 120 | for characters as WIDTHTAB. We use this to decide when to | 120 | for characters as WIDTHTAB. We use this to decide when to |
| 121 | invalidate the buffer's width_run_cache. */ | 121 | invalidate the buffer's width_run_cache. */ |
| 122 | 122 | ||
diff --git a/src/indent.h b/src/indent.h index 2d3c158b069..2e873769603 100644 --- a/src/indent.h +++ b/src/indent.h | |||
| @@ -61,7 +61,7 @@ extern int last_known_column_point; | |||
| 61 | 61 | ||
| 62 | /* Functions for dealing with the column cache. */ | 62 | /* Functions for dealing with the column cache. */ |
| 63 | 63 | ||
| 64 | /* Return true iff the display table DISPTAB specifies the same widths | 64 | /* Return true if the display table DISPTAB specifies the same widths |
| 65 | for characters as WIDTHTAB. We use this to decide when to | 65 | for characters as WIDTHTAB. We use this to decide when to |
| 66 | invalidate the buffer's column_cache. */ | 66 | invalidate the buffer's column_cache. */ |
| 67 | int disptab_matches_widthtab P_ ((struct Lisp_Char_Table *disptab, | 67 | int disptab_matches_widthtab P_ ((struct Lisp_Char_Table *disptab, |
diff --git a/src/intervals.c b/src/intervals.c index 89f99a052b9..a695976b8b7 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -2200,7 +2200,7 @@ set_point_both (buffer, charpos, bytepos) | |||
| 2200 | 2200 | ||
| 2201 | temp_set_point_both (buffer, charpos, bytepos); | 2201 | temp_set_point_both (buffer, charpos, bytepos); |
| 2202 | 2202 | ||
| 2203 | /* We run point-left and point-entered hooks here, iff the | 2203 | /* We run point-left and point-entered hooks here, if the |
| 2204 | two intervals are not equivalent. These hooks take | 2204 | two intervals are not equivalent. These hooks take |
| 2205 | (old_point, new_point) as arguments. */ | 2205 | (old_point, new_point) as arguments. */ |
| 2206 | if (NILP (Vinhibit_point_motion_hooks) | 2206 | if (NILP (Vinhibit_point_motion_hooks) |
diff --git a/src/keyboard.c b/src/keyboard.c index 5cedd0572b2..171f2da7217 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -500,7 +500,7 @@ static struct input_event * volatile kbd_store_ptr; | |||
| 500 | /* The above pair of variables forms a "queue empty" flag. When we | 500 | /* The above pair of variables forms a "queue empty" flag. When we |
| 501 | enqueue a non-hook event, we increment kbd_store_ptr. When we | 501 | enqueue a non-hook event, we increment kbd_store_ptr. When we |
| 502 | dequeue a non-hook event, we increment kbd_fetch_ptr. We say that | 502 | dequeue a non-hook event, we increment kbd_fetch_ptr. We say that |
| 503 | there is input available iff the two pointers are not equal. | 503 | there is input available if the two pointers are not equal. |
| 504 | 504 | ||
| 505 | Why not just have a flag set and cleared by the enqueuing and | 505 | Why not just have a flag set and cleared by the enqueuing and |
| 506 | dequeuing functions? Such a flag could be screwed up by interrupts | 506 | dequeuing functions? Such a flag could be screwed up by interrupts |
| @@ -3590,7 +3590,7 @@ restore_getcjmp (temp) | |||
| 3590 | kbd_buffer_store_event places events in kbd_buffer, and | 3590 | kbd_buffer_store_event places events in kbd_buffer, and |
| 3591 | kbd_buffer_get_event retrieves them. */ | 3591 | kbd_buffer_get_event retrieves them. */ |
| 3592 | 3592 | ||
| 3593 | /* Return true iff there are any events in the queue that read-char | 3593 | /* Return true if there are any events in the queue that read-char |
| 3594 | would return. If this returns false, a read-char would block. */ | 3594 | would return. If this returns false, a read-char would block. */ |
| 3595 | static int | 3595 | static int |
| 3596 | readable_events (flags) | 3596 | readable_events (flags) |
diff --git a/src/keyboard.h b/src/keyboard.h index e24f9a133ae..15e55ad4e67 100644 --- a/src/keyboard.h +++ b/src/keyboard.h | |||
| @@ -240,7 +240,7 @@ extern Lisp_Object item_properties; | |||
| 240 | 240 | ||
| 241 | /* Macros for dealing with lispy events. */ | 241 | /* Macros for dealing with lispy events. */ |
| 242 | 242 | ||
| 243 | /* True iff EVENT has data fields describing it (i.e. a mouse click). */ | 243 | /* True if EVENT has data fields describing it (i.e. a mouse click). */ |
| 244 | #define EVENT_HAS_PARAMETERS(event) (CONSP (event)) | 244 | #define EVENT_HAS_PARAMETERS(event) (CONSP (event)) |
| 245 | 245 | ||
| 246 | /* Extract the head from an event. | 246 | /* Extract the head from an event. |
diff --git a/src/keymap.c b/src/keymap.c index a39c0d43984..e1e45b18d4e 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -4093,7 +4093,7 @@ don't alter it yourself. */); | |||
| 4093 | DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist, | 4093 | DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist, |
| 4094 | doc: /* Alist of keymaps to use for minor modes. | 4094 | doc: /* Alist of keymaps to use for minor modes. |
| 4095 | Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read | 4095 | Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read |
| 4096 | key sequences and look up bindings iff VARIABLE's value is non-nil. | 4096 | key sequences and look up bindings if VARIABLE's value is non-nil. |
| 4097 | If two active keymaps bind the same key, the keymap appearing earlier | 4097 | If two active keymaps bind the same key, the keymap appearing earlier |
| 4098 | in the list takes precedence. */); | 4098 | in the list takes precedence. */); |
| 4099 | Vminor_mode_map_alist = Qnil; | 4099 | Vminor_mode_map_alist = Qnil; |
diff --git a/src/lisp.h b/src/lisp.h index 9a13a95b3b0..7499349a193 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -1441,7 +1441,7 @@ typedef unsigned char UCHAR; | |||
| 1441 | #define GLYPH_CHAR(f, g) (FAST_GLYPH_CHAR (g)) | 1441 | #define GLYPH_CHAR(f, g) (FAST_GLYPH_CHAR (g)) |
| 1442 | #define GLYPH_FACE(f, g) (FAST_GLYPH_FACE (g)) | 1442 | #define GLYPH_FACE(f, g) (FAST_GLYPH_FACE (g)) |
| 1443 | 1443 | ||
| 1444 | /* Return 1 iff GLYPH contains valid character code. */ | 1444 | /* Return 1 if GLYPH contains valid character code. */ |
| 1445 | #define GLYPH_CHAR_VALID_P(glyph) CHAR_VALID_P (FAST_GLYPH_CHAR (glyph), 1) | 1445 | #define GLYPH_CHAR_VALID_P(glyph) CHAR_VALID_P (FAST_GLYPH_CHAR (glyph), 1) |
| 1446 | 1446 | ||
| 1447 | /* The ID of the mode line highlighting face. */ | 1447 | /* The ID of the mode line highlighting face. */ |
| @@ -1588,7 +1588,7 @@ typedef unsigned char UCHAR; | |||
| 1588 | "dead", which is what we want; this is an argument-checking macro, and | 1588 | "dead", which is what we want; this is an argument-checking macro, and |
| 1589 | the user should never get access to interior windows. | 1589 | the user should never get access to interior windows. |
| 1590 | 1590 | ||
| 1591 | A window of any sort, leaf or interior, is dead iff the buffer, | 1591 | A window of any sort, leaf or interior, is dead if the buffer, |
| 1592 | vchild, and hchild members are all nil. */ | 1592 | vchild, and hchild members are all nil. */ |
| 1593 | 1593 | ||
| 1594 | #define CHECK_LIVE_WINDOW(x) \ | 1594 | #define CHECK_LIVE_WINDOW(x) \ |
diff --git a/src/lread.c b/src/lread.c index 5ecb521ff8a..5037937e08b 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -93,7 +93,7 @@ Lisp_Object Qfile_truename, Qdo_after_load_evaluation; /* ACM 2006/5/16 */ | |||
| 93 | extern Lisp_Object Qevent_symbol_element_mask; | 93 | extern Lisp_Object Qevent_symbol_element_mask; |
| 94 | extern Lisp_Object Qfile_exists_p; | 94 | extern Lisp_Object Qfile_exists_p; |
| 95 | 95 | ||
| 96 | /* non-zero iff inside `load' */ | 96 | /* non-zero if inside `load' */ |
| 97 | int load_in_progress; | 97 | int load_in_progress; |
| 98 | 98 | ||
| 99 | /* Directory in which the sources were found. */ | 99 | /* Directory in which the sources were found. */ |
| @@ -1126,7 +1126,7 @@ in which case file-name-handlers are ignored. */) | |||
| 1126 | On success, returns a file descriptor. On failure, returns -1. | 1126 | On success, returns a file descriptor. On failure, returns -1. |
| 1127 | 1127 | ||
| 1128 | SUFFIXES is a list of strings containing possible suffixes. | 1128 | SUFFIXES is a list of strings containing possible suffixes. |
| 1129 | The empty suffix is automatically added iff the list is empty. | 1129 | The empty suffix is automatically added if the list is empty. |
| 1130 | 1130 | ||
| 1131 | PREDICATE non-nil means don't open the files, | 1131 | PREDICATE non-nil means don't open the files, |
| 1132 | just look for one that satisfies the predicate. In this case, | 1132 | just look for one that satisfies the predicate. In this case, |
| @@ -4074,7 +4074,7 @@ customize `jka-compr-load-suffixes' rather than the present variable. */); | |||
| 4074 | Vload_file_rep_suffixes = Fcons (build_string (""), Qnil); | 4074 | Vload_file_rep_suffixes = Fcons (build_string (""), Qnil); |
| 4075 | 4075 | ||
| 4076 | DEFVAR_BOOL ("load-in-progress", &load_in_progress, | 4076 | DEFVAR_BOOL ("load-in-progress", &load_in_progress, |
| 4077 | doc: /* Non-nil iff inside of `load'. */); | 4077 | doc: /* Non-nil if inside of `load'. */); |
| 4078 | 4078 | ||
| 4079 | DEFVAR_LISP ("after-load-alist", &Vafter_load_alist, | 4079 | DEFVAR_LISP ("after-load-alist", &Vafter_load_alist, |
| 4080 | doc: /* An alist of expressions to be evalled when particular files are loaded. | 4080 | doc: /* An alist of expressions to be evalled when particular files are loaded. |
diff --git a/src/macterm.c b/src/macterm.c index 87a9861934c..b282bac3aa6 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -11109,7 +11109,7 @@ XTread_socket (sd, expected, hold_quit) | |||
| 11109 | /* Window will be selected only when it is | 11109 | /* Window will be selected only when it is |
| 11110 | not selected now and last mouse movement | 11110 | not selected now and last mouse movement |
| 11111 | event was not in it. Minibuffer window | 11111 | event was not in it. Minibuffer window |
| 11112 | will be selected iff it is active. */ | 11112 | will be selected only when it is active. */ |
| 11113 | if (WINDOWP (window) | 11113 | if (WINDOWP (window) |
| 11114 | && !EQ (window, last_window) | 11114 | && !EQ (window, last_window) |
| 11115 | && !EQ (window, selected_window)) | 11115 | && !EQ (window, selected_window)) |
diff --git a/src/macterm.h b/src/macterm.h index f9ce0ef051d..6a68f39762d 100644 --- a/src/macterm.h +++ b/src/macterm.h | |||
| @@ -150,7 +150,7 @@ struct mac_display_info | |||
| 150 | char *mac_id_name; | 150 | char *mac_id_name; |
| 151 | 151 | ||
| 152 | /* The number of fonts actually stored in the font table. | 152 | /* The number of fonts actually stored in the font table. |
| 153 | font_table[n] is used and valid iff 0 <= n < n_fonts. 0 <= | 153 | font_table[n] is used and valid if 0 <= n < n_fonts. 0 <= |
| 154 | n_fonts <= font_table_size and font_table[i].name != 0. */ | 154 | n_fonts <= font_table_size and font_table[i].name != 0. */ |
| 155 | int n_fonts; | 155 | int n_fonts; |
| 156 | 156 | ||
diff --git a/src/msdos.c b/src/msdos.c index 59854268e14..ef65597f7e7 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -3231,7 +3231,7 @@ dos_rawgetc () | |||
| 3231 | `dos_get_modifiers', they might have already released the | 3231 | `dos_get_modifiers', they might have already released the |
| 3232 | Alt key, and Emacs gets just `x', which is BAD. | 3232 | Alt key, and Emacs gets just `x', which is BAD. |
| 3233 | However, for keys with the `Map' property set, the ASCII | 3233 | However, for keys with the `Map' property set, the ASCII |
| 3234 | code returns zero iff Alt is pressed. So, when we DON'T | 3234 | code returns zero only if Alt is pressed. So, when we DON'T |
| 3235 | have to support international_keyboard, we don't have to | 3235 | have to support international_keyboard, we don't have to |
| 3236 | distinguish between the left and right Alt keys, and we | 3236 | distinguish between the left and right Alt keys, and we |
| 3237 | can set the META modifier for any keys with the `Map' | 3237 | can set the META modifier for any keys with the `Map' |
diff --git a/src/process.c b/src/process.c index 99c5e07f0d4..97bcba3b392 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2781,7 +2781,7 @@ The stopped state is cleared by `continue-process' and set by | |||
| 2781 | 2781 | ||
| 2782 | :filter-multibyte BOOL -- If BOOL is non-nil, strings given to the | 2782 | :filter-multibyte BOOL -- If BOOL is non-nil, strings given to the |
| 2783 | process filter are multibyte, otherwise they are unibyte. | 2783 | process filter are multibyte, otherwise they are unibyte. |
| 2784 | If this keyword is not specified, the strings are multibyte iff | 2784 | If this keyword is not specified, the strings are multibyte if |
| 2785 | `default-enable-multibyte-characters' is non-nil. | 2785 | `default-enable-multibyte-characters' is non-nil. |
| 2786 | 2786 | ||
| 2787 | :sentinel SENTINEL -- Install SENTINEL as the process sentinel. | 2787 | :sentinel SENTINEL -- Install SENTINEL as the process sentinel. |
| @@ -3920,7 +3920,7 @@ it specifies a fractional number of seconds to wait. | |||
| 3920 | If optional fourth arg JUST-THIS-ONE is non-nil, only accept output | 3920 | If optional fourth arg JUST-THIS-ONE is non-nil, only accept output |
| 3921 | from PROCESS, suspending reading output from other processes. | 3921 | from PROCESS, suspending reading output from other processes. |
| 3922 | If JUST-THIS-ONE is an integer, don't run any timers either. | 3922 | If JUST-THIS-ONE is an integer, don't run any timers either. |
| 3923 | Return non-nil iff we received any output before the timeout expired. */) | 3923 | Return non-nil if we received any output before the timeout expired. */) |
| 3924 | (process, seconds, millisec, just_this_one) | 3924 | (process, seconds, millisec, just_this_one) |
| 3925 | register Lisp_Object process, seconds, millisec, just_this_one; | 3925 | register Lisp_Object process, seconds, millisec, just_this_one; |
| 3926 | { | 3926 | { |
| @@ -4253,16 +4253,16 @@ select_wrapper (n, rfd, wfd, xfd, tmo) | |||
| 4253 | (and gobble terminal input into the buffer if any arrives). | 4253 | (and gobble terminal input into the buffer if any arrives). |
| 4254 | 4254 | ||
| 4255 | If WAIT_PROC is specified, wait until something arrives from that | 4255 | If WAIT_PROC is specified, wait until something arrives from that |
| 4256 | process. The return value is true iff we read some input from | 4256 | process. The return value is true if we read some input from |
| 4257 | that process. | 4257 | that process. |
| 4258 | 4258 | ||
| 4259 | If JUST_WAIT_PROC is non-nil, handle only output from WAIT_PROC | 4259 | If JUST_WAIT_PROC is non-nil, handle only output from WAIT_PROC |
| 4260 | (suspending output from other processes). A negative value | 4260 | (suspending output from other processes). A negative value |
| 4261 | means don't run any timers either. | 4261 | means don't run any timers either. |
| 4262 | 4262 | ||
| 4263 | If WAIT_PROC is specified, then the function returns true iff we | 4263 | If WAIT_PROC is specified, then the function returns true if we |
| 4264 | received input from that process before the timeout elapsed. | 4264 | received input from that process before the timeout elapsed. |
| 4265 | Otherwise, return true iff we received input from any process. */ | 4265 | Otherwise, return true if we received input from any process. */ |
| 4266 | 4266 | ||
| 4267 | int | 4267 | int |
| 4268 | wait_reading_process_output (time_limit, microsecs, read_kbd, do_display, | 4268 | wait_reading_process_output (time_limit, microsecs, read_kbd, do_display, |
| @@ -7324,7 +7324,7 @@ Lisp_Object QCtype; | |||
| 7324 | do_display != 0 means redisplay should be done to show subprocess | 7324 | do_display != 0 means redisplay should be done to show subprocess |
| 7325 | output that arrives. | 7325 | output that arrives. |
| 7326 | 7326 | ||
| 7327 | Return true iff we received input from any process. */ | 7327 | Return true if we received input from any process. */ |
| 7328 | 7328 | ||
| 7329 | int | 7329 | int |
| 7330 | wait_reading_process_output (time_limit, microsecs, read_kbd, do_display, | 7330 | wait_reading_process_output (time_limit, microsecs, read_kbd, do_display, |
diff --git a/src/process.h b/src/process.h index 6fb783e72b0..2502e61a31d 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -138,7 +138,7 @@ extern Lisp_Object chan_process[]; | |||
| 138 | /* Alist of elements (NAME . PROCESS). */ | 138 | /* Alist of elements (NAME . PROCESS). */ |
| 139 | extern Lisp_Object Vprocess_alist; | 139 | extern Lisp_Object Vprocess_alist; |
| 140 | 140 | ||
| 141 | /* True iff we are about to fork off a synchronous process or if we | 141 | /* True if we are about to fork off a synchronous process or if we |
| 142 | are waiting for it. */ | 142 | are waiting for it. */ |
| 143 | extern int synch_process_alive; | 143 | extern int synch_process_alive; |
| 144 | 144 | ||
diff --git a/src/regex.c b/src/regex.c index 095afa1c465..6435133c96f 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -2048,7 +2048,7 @@ re_wctype (str) | |||
| 2048 | else return 0; | 2048 | else return 0; |
| 2049 | } | 2049 | } |
| 2050 | 2050 | ||
| 2051 | /* True iff CH is in the char class CC. */ | 2051 | /* True if CH is in the char class CC. */ |
| 2052 | boolean | 2052 | boolean |
| 2053 | re_iswctype (ch, cc) | 2053 | re_iswctype (ch, cc) |
| 2054 | int ch; | 2054 | int ch; |
diff --git a/src/search.c b/src/search.c index c74b1071237..3a9fabeb3ce 100644 --- a/src/search.c +++ b/src/search.c | |||
| @@ -1614,7 +1614,7 @@ simple_search (n, pat, len, len_byte, trt, pos, pos_byte, lim, lim_byte) | |||
| 1614 | have nontrivial translation are the same aside from the last byte. | 1614 | have nontrivial translation are the same aside from the last byte. |
| 1615 | This makes it possible to translate just the last byte of a | 1615 | This makes it possible to translate just the last byte of a |
| 1616 | character, and do so after just a simple test of the context. | 1616 | character, and do so after just a simple test of the context. |
| 1617 | CHARSET_BASE is nonzero iff there is such a non-ASCII character. | 1617 | CHARSET_BASE is nonzero if there is such a non-ASCII character. |
| 1618 | 1618 | ||
| 1619 | If that criterion is not satisfied, do not call this function. */ | 1619 | If that criterion is not satisfied, do not call this function. */ |
| 1620 | 1620 | ||
diff --git a/src/systime.h b/src/systime.h index 85c2799f083..8b1b7f56ad6 100644 --- a/src/systime.h +++ b/src/systime.h | |||
| @@ -67,7 +67,7 @@ extern time_t timezone; | |||
| 67 | EMACS_SECS (TIME) is an rvalue for the seconds component of TIME. | 67 | EMACS_SECS (TIME) is an rvalue for the seconds component of TIME. |
| 68 | EMACS_SET_SECS (TIME, SECONDS) sets that to SECONDS. | 68 | EMACS_SET_SECS (TIME, SECONDS) sets that to SECONDS. |
| 69 | 69 | ||
| 70 | EMACS_HAS_USECS is defined iff EMACS_TIME has a usecs component. | 70 | EMACS_HAS_USECS is defined if EMACS_TIME has a usecs component. |
| 71 | EMACS_USECS (TIME) is an rvalue for the microseconds component of TIME. | 71 | EMACS_USECS (TIME) is an rvalue for the microseconds component of TIME. |
| 72 | This returns zero if EMACS_TIME doesn't have a microseconds component. | 72 | This returns zero if EMACS_TIME doesn't have a microseconds component. |
| 73 | EMACS_SET_USECS (TIME, MICROSECONDS) sets that to MICROSECONDS. | 73 | EMACS_SET_USECS (TIME, MICROSECONDS) sets that to MICROSECONDS. |
| @@ -83,7 +83,7 @@ extern time_t timezone; | |||
| 83 | 83 | ||
| 84 | EMACS_SUB_TIME (DEST, SRC1, SRC2) subtracts SRC2 from SRC1 and | 84 | EMACS_SUB_TIME (DEST, SRC1, SRC2) subtracts SRC2 from SRC1 and |
| 85 | stores the result in DEST. SRC should not be negative. | 85 | stores the result in DEST. SRC should not be negative. |
| 86 | EMACS_TIME_NEG_P (TIME) is true iff TIME is negative. | 86 | EMACS_TIME_NEG_P (TIME) is true if TIME is negative. |
| 87 | 87 | ||
| 88 | */ | 88 | */ |
| 89 | 89 | ||
diff --git a/src/systty.h b/src/systty.h index 15dd7a4e26c..c89edfc8d93 100644 --- a/src/systty.h +++ b/src/systty.h | |||
| @@ -297,7 +297,7 @@ static struct sensemode { | |||
| 297 | written before making the change. | 297 | written before making the change. |
| 298 | Return 0 if all went well, and -1 if anything failed. | 298 | Return 0 if all went well, and -1 if anything failed. |
| 299 | 299 | ||
| 300 | EMACS_TTY_TABS_OK (struct emacs_tty *P) is false iff the kernel | 300 | EMACS_TTY_TABS_OK (struct emacs_tty *P) is false if the kernel |
| 301 | expands tabs to spaces upon output; in that case, there is no | 301 | expands tabs to spaces upon output; in that case, there is no |
| 302 | advantage to using tabs over spaces. */ | 302 | advantage to using tabs over spaces. */ |
| 303 | 303 | ||
diff --git a/src/termhooks.h b/src/termhooks.h index 5d317f2da3d..32078254593 100644 --- a/src/termhooks.h +++ b/src/termhooks.h | |||
| @@ -201,7 +201,7 @@ extern void (*judge_scroll_bars_hook) P_ ((struct frame *FRAME)); | |||
| 201 | /* Input queue declarations and hooks. */ | 201 | /* Input queue declarations and hooks. */ |
| 202 | 202 | ||
| 203 | /* Expedient hack: only provide the below definitions to files that | 203 | /* Expedient hack: only provide the below definitions to files that |
| 204 | are prepared to handle lispy things. CONSP is defined iff lisp.h | 204 | are prepared to handle lispy things. CONSP is defined if lisp.h |
| 205 | has been included before this file. */ | 205 | has been included before this file. */ |
| 206 | #ifdef CONSP | 206 | #ifdef CONSP |
| 207 | 207 | ||
diff --git a/src/textprop.c b/src/textprop.c index 711ee571af6..8ce5656e5a2 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -1633,8 +1633,8 @@ Return t if any property was actually removed, nil otherwise. */) | |||
| 1633 | The flag `modified' records if changes have been made. | 1633 | The flag `modified' records if changes have been made. |
| 1634 | When object is a buffer, we must call modify_region before changes are | 1634 | When object is a buffer, we must call modify_region before changes are |
| 1635 | made and signal_after_change when we are done. | 1635 | made and signal_after_change when we are done. |
| 1636 | We call modify_region before calling remove_properties iff modified == 0, | 1636 | We call modify_region before calling remove_properties if modified == 0, |
| 1637 | and we call signal_after_change before returning iff modified != 0. */ | 1637 | and we call signal_after_change before returning if modified != 0. */ |
| 1638 | for (;;) | 1638 | for (;;) |
| 1639 | { | 1639 | { |
| 1640 | if (i == 0) | 1640 | if (i == 0) |
diff --git a/src/w32term.c b/src/w32term.c index b3bf9a0f704..0422257f2d6 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -4336,7 +4336,7 @@ w32_read_socket (sd, expected, hold_quit) | |||
| 4336 | /* Window will be selected only when it is not | 4336 | /* Window will be selected only when it is not |
| 4337 | selected now and last mouse movement event was | 4337 | selected now and last mouse movement event was |
| 4338 | not in it. Minibuffer window will be selected | 4338 | not in it. Minibuffer window will be selected |
| 4339 | iff it is active. */ | 4339 | only when it is active. */ |
| 4340 | if (WINDOWP(window) | 4340 | if (WINDOWP(window) |
| 4341 | && !EQ (window, last_window) | 4341 | && !EQ (window, last_window) |
| 4342 | && !EQ (window, selected_window)) | 4342 | && !EQ (window, selected_window)) |
diff --git a/src/w32term.h b/src/w32term.h index 3bf7d588501..acf864d5f38 100644 --- a/src/w32term.h +++ b/src/w32term.h | |||
| @@ -198,7 +198,7 @@ struct w32_display_info | |||
| 198 | char *w32_id_name; | 198 | char *w32_id_name; |
| 199 | 199 | ||
| 200 | /* The number of fonts actually stored in w32_font_table. | 200 | /* The number of fonts actually stored in w32_font_table. |
| 201 | font_table[n] is used and valid iff 0 <= n < n_fonts. 0 <= | 201 | font_table[n] is used and valid if 0 <= n < n_fonts. 0 <= |
| 202 | n_fonts <= font_table_size. and font_table[i].name != 0. */ | 202 | n_fonts <= font_table_size. and font_table[i].name != 0. */ |
| 203 | int n_fonts; | 203 | int n_fonts; |
| 204 | 204 | ||
diff --git a/src/window.h b/src/window.h index a5c1f34a0ce..ea8965392c4 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -819,7 +819,7 @@ extern int command_loop_level; | |||
| 819 | 819 | ||
| 820 | extern int minibuf_level; | 820 | extern int minibuf_level; |
| 821 | 821 | ||
| 822 | /* true iff we should redraw the mode lines on the next redisplay. */ | 822 | /* true if we should redraw the mode lines on the next redisplay. */ |
| 823 | 823 | ||
| 824 | extern int update_mode_lines; | 824 | extern int update_mode_lines; |
| 825 | 825 | ||
diff --git a/src/xterm.c b/src/xterm.c index 3deb518bad5..00d653fc19f 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6622,7 +6622,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 6622 | 6622 | ||
| 6623 | /* Window will be selected only when it is not selected now and | 6623 | /* Window will be selected only when it is not selected now and |
| 6624 | last mouse movement event was not in it. Minibuffer window | 6624 | last mouse movement event was not in it. Minibuffer window |
| 6625 | will be selected iff it is active. */ | 6625 | will be selected only when it is active. */ |
| 6626 | if (WINDOWP (window) | 6626 | if (WINDOWP (window) |
| 6627 | && !EQ (window, last_window) | 6627 | && !EQ (window, last_window) |
| 6628 | && !EQ (window, selected_window)) | 6628 | && !EQ (window, selected_window)) |
diff --git a/src/xterm.h b/src/xterm.h index 84f12d94abd..ad768e36779 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -253,7 +253,7 @@ struct x_display_info | |||
| 253 | char *x_id_name; | 253 | char *x_id_name; |
| 254 | 254 | ||
| 255 | /* The number of fonts actually stored in x_font_table. | 255 | /* The number of fonts actually stored in x_font_table. |
| 256 | font_table[n] is used and valid iff 0 <= n < n_fonts. 0 <= | 256 | font_table[n] is used and valid if 0 <= n < n_fonts. 0 <= |
| 257 | n_fonts <= font_table_size and font_table[i].name != 0. */ | 257 | n_fonts <= font_table_size and font_table[i].name != 0. */ |
| 258 | int n_fonts; | 258 | int n_fonts; |
| 259 | 259 | ||