aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/dispextern.h6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 949ea741e1d..829eb25f4d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12015-01-30 Eli Zaretskii <eliz@gnu.org>
2
3 * dispextern.h (FACE_FOR_CHAR): Fix the commentary.
4
12015-01-29 Hans Wennborg <hwennborg@google.com> (tiny change) 52015-01-29 Hans Wennborg <hwennborg@google.com> (tiny change)
2 6
3 * emacs.c (decode_env_path): Add parentheses around ternary 7 * emacs.c (decode_env_path): Add parentheses around ternary
diff --git a/src/dispextern.h b/src/dispextern.h
index d6bbb0b4c6c..239c4425646 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1821,8 +1821,10 @@ struct face_cache
1821 ((FACE) == (FACE)->ascii_face) 1821 ((FACE) == (FACE)->ascii_face)
1822 1822
1823/* Return the id of the realized face on frame F that is like the face 1823/* Return the id of the realized face on frame F that is like the face
1824 with id ID but is suitable for displaying character CHAR. 1824 FACE, but is suitable for displaying character CHAR at buffer or
1825 This macro is only meaningful for multibyte character CHAR. */ 1825 string position POS. OBJECT is the string object, or nil for
1826 buffer. This macro is only meaningful for multibyte character
1827 CHAR. */
1826 1828
1827#define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) \ 1829#define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) \
1828 face_for_char ((F), (FACE), (CHAR), (POS), (OBJECT)) 1830 face_for_char ((F), (FACE), (CHAR), (POS), (OBJECT))