HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
GLYPH_CODE_FACE returns EMACS_INT, not int.
[bpt/emacs.git]
/
src
/
xfaces.c
diff --git
a/src/xfaces.c
b/src/xfaces.c
index
b147102
..
a56e54c
100644
(file)
--- a/
src/xfaces.c
+++ b/
src/xfaces.c
@@
-6223,7
+6223,8
@@
face_at_string_position (struct window *w, Lisp_Object string,
*/
int
-merge_faces (struct frame *f, Lisp_Object face_name, int face_id, int base_face_id)
+merge_faces (struct frame *f, Lisp_Object face_name, EMACS_INT face_id,
+ int base_face_id)
{
Lisp_Object attrs[LFACE_VECTOR_SIZE];
struct face *base_face;