diff options
| author | Kenichi Handa | 2004-01-13 01:34:56 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-01-13 01:34:56 +0000 |
| commit | 83a90904ea13dd116b89dc56aae57b35aff57d50 (patch) | |
| tree | a5fdac013ce67494295eb43b0cbe8a25735f0fb7 /src | |
| parent | 22557137c78a5ebc512b3962f269274ac487acf7 (diff) | |
| download | emacs-83a90904ea13dd116b89dc56aae57b35aff57d50.tar.gz emacs-83a90904ea13dd116b89dc56aae57b35aff57d50.zip | |
(FACE_FOR_CHAR): New args POS and OBJECT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispextern.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 7e917908e19..03eda50d714 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -1540,15 +1540,15 @@ struct face_cache | |||
| 1540 | with id ID but is suitable for displaying character CHAR. | 1540 | with id ID but is suitable for displaying character CHAR. |
| 1541 | This macro is only meaningful for multibyte character CHAR. */ | 1541 | This macro is only meaningful for multibyte character CHAR. */ |
| 1542 | 1542 | ||
| 1543 | #define FACE_FOR_CHAR(F, FACE, CHAR) \ | 1543 | #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) \ |
| 1544 | (ASCII_CHAR_P (CHAR) \ | 1544 | (ASCII_CHAR_P (CHAR) \ |
| 1545 | ? (FACE)->ascii_face->id \ | 1545 | ? (FACE)->ascii_face->id \ |
| 1546 | : face_for_char ((F), (FACE), (CHAR))) | 1546 | : face_for_char ((F), (FACE), (CHAR), (POS), (OBJECT))) |
| 1547 | 1547 | ||
| 1548 | #else /* not HAVE_WINDOW_SYSTEM */ | 1548 | #else /* not HAVE_WINDOW_SYSTEM */ |
| 1549 | 1549 | ||
| 1550 | #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) 1 | 1550 | #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR) 1 |
| 1551 | #define FACE_FOR_CHAR(F, FACE, CHAR) ((FACE)->id) | 1551 | #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) ((FACE)->id) |
| 1552 | 1552 | ||
| 1553 | #endif /* not HAVE_WINDOW_SYSTEM */ | 1553 | #endif /* not HAVE_WINDOW_SYSTEM */ |
| 1554 | 1554 | ||