diff options
| author | Kenichi Handa | 1997-10-23 12:01:50 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1997-10-23 12:01:50 +0000 |
| commit | 15979e9ebcdeb0e622057faa81c935f98c67a80d (patch) | |
| tree | d9fd8621725fcfa7e1095736bb8922ee5aff73e5 /src | |
| parent | 70c222451ed8c2557306ad46d862b7fbef0828d2 (diff) | |
| download | emacs-15979e9ebcdeb0e622057faa81c935f98c67a80d.tar.gz emacs-15979e9ebcdeb0e622057faa81c935f98c67a80d.zip | |
(CHAR_VALID_P): Renamed from VALID_CHAR_P, new
argument GENERICP. Call char_valid_p for a non-ASCII character.
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/charset.h b/src/charset.h index 9923336ddec..1358a5be4dd 100644 --- a/src/charset.h +++ b/src/charset.h | |||
| @@ -462,15 +462,12 @@ extern int width_by_char_head[256]; | |||
| 462 | ? (c1) \ | 462 | ? (c1) \ |
| 463 | : MAKE_NON_ASCII_CHAR ((charset), (c1) & 0x7F, (c2) & 0x7F)) | 463 | : MAKE_NON_ASCII_CHAR ((charset), (c1) & 0x7F, (c2) & 0x7F)) |
| 464 | 464 | ||
| 465 | /* 1 if C is in the range of possible character code Emacs can have. */ | 465 | /* If GENERICP is nonzero, return nonzero iff C is a valid normal or |
| 466 | #define VALID_CHAR_P(c) \ | 466 | generic character. If GENERICP is zero, return nonzero iff C is a |
| 467 | ((c) >= 0 \ | 467 | valid normal character. */ |
| 468 | && (SINGLE_BYTE_CHAR_P (c) \ | 468 | #define CHAR_VALID_P(c, genericp) \ |
| 469 | || ((c) < MIN_CHAR_COMPOSITION \ | 469 | ((c) >= 0 \ |
| 470 | ? ((c) & CHAR_FIELD1_MASK \ | 470 | && (SINGLE_BYTE_CHAR_P (c) || char_valid_p (c, genericp))) |
| 471 | ? (CHAR_FIELD2 (c) >= 32 && CHAR_FIELD3 (c) >= 32) \ | ||
| 472 | : (CHAR_FIELD2 (c) >= 16 && CHAR_FIELD3 (c) >= 32)) \ | ||
| 473 | : (c) < MIN_CHAR_COMPOSITION + n_cmpchars))) | ||
| 474 | 471 | ||
| 475 | /* The charset of non-ASCII character C is stored in CHARSET, and the | 472 | /* The charset of non-ASCII character C is stored in CHARSET, and the |
| 476 | position-codes of C are stored in C1 and C2. | 473 | position-codes of C are stored in C1 and C2. |