projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
glyphs.c
diff --git
a/src/glyphs.c
b/src/glyphs.c
index
6fbe951
..
a83f4b9
100644
(file)
--- a/
src/glyphs.c
+++ b/
src/glyphs.c
@@
-2265,7
+2265,7
@@
query_string_geometry (Lisp_Object string, Lisp_Object face,
int* width, int* height, int* descent, Lisp_Object domain)
{
struct font_metric_info fm;
int* width, int* height, int* descent, Lisp_Object domain)
{
struct font_metric_info fm;
- unsigned char charsets[NUM_LEADING_BYTES];
+ Charset_ID charsets[NUM_LEADING_BYTES];
struct face_cachel frame_cachel;
struct face_cachel *cachel;
Lisp_Object frame = DOMAIN_FRAME (domain);
struct face_cachel frame_cachel;
struct face_cachel *cachel;
Lisp_Object frame = DOMAIN_FRAME (domain);
@@
-2319,7
+2319,7
@@
query_string_geometry (Lisp_Object string, Lisp_Object face,
Lisp_Object
query_string_font (Lisp_Object string, Lisp_Object face, Lisp_Object domain)
{
Lisp_Object
query_string_font (Lisp_Object string, Lisp_Object face, Lisp_Object domain)
{
- unsigned char charsets[NUM_LEADING_BYTES];
+ Charset_ID charsets[NUM_LEADING_BYTES];
struct face_cachel frame_cachel;
struct face_cachel *cachel;
int i;
struct face_cachel frame_cachel;
struct face_cachel *cachel;
int i;
@@
-4634,8
+4634,8
@@
void unmap_subwindow (Lisp_Object subwindow)
ERROR_CHECK_IMAGE_INSTANCE (subwindow);
ERROR_CHECK_IMAGE_INSTANCE (subwindow);
- if (!image_instance_type_to_mask (IMAGE_INSTANCE_TYPE (ii))
- & (IMAGE_WIDGET_MASK | IMAGE_SUBWINDOW_MASK)
+ if (!(image_instance_type_to_mask (IMAGE_INSTANCE_TYPE (ii))
+ & (IMAGE_WIDGET_MASK | IMAGE_SUBWINDOW_MASK))
||
!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (ii))
return;
||
!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (ii))
return;
@@
-4665,8
+4665,8
@@
void map_subwindow (Lisp_Object subwindow, int x, int y,
ERROR_CHECK_IMAGE_INSTANCE (subwindow);
ERROR_CHECK_IMAGE_INSTANCE (subwindow);
- if (!image_instance_type_to_mask (IMAGE_INSTANCE_TYPE (ii))
- & (IMAGE_WIDGET_MASK | IMAGE_SUBWINDOW_MASK))
+ if (!(image_instance_type_to_mask (IMAGE_INSTANCE_TYPE (ii))
+ & (IMAGE_WIDGET_MASK | IMAGE_SUBWINDOW_MASK)))
return;
#ifdef DEBUG_WIDGETS
return;
#ifdef DEBUG_WIDGETS