projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some Adobe-Japan1-5 code points.
[chise/xemacs-chise.git-]
/
src
/
redisplay-x.c
diff --git
a/src/redisplay-x.c
b/src/redisplay-x.c
index
711638b
..
f2acc68
100644
(file)
--- a/
src/redisplay-x.c
+++ b/
src/redisplay-x.c
@@
-327,7
+327,7
@@
x_output_display_block (struct window *w, struct display_line *dl, int block,
int cursor_width, int cursor_height)
{
struct frame *f = XFRAME (w->frame);
int cursor_width, int cursor_height)
{
struct frame *f = XFRAME (w->frame);
- Charc_dynarr *buf = Dynarr_new (Charc);
+ Charc_dynarr *buf;
Lisp_Object window;
struct display_block *db = Dynarr_atp (dl->display_blocks, block);
Lisp_Object window;
struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@
-354,7
+354,7
@@
x_output_display_block (struct window *w, struct display_line *dl, int block,
if (end < 0)
end = Dynarr_length (rba);
if (end < 0)
end = Dynarr_length (rba);
- Dynarr_reset (buf);
+ buf = Dynarr_new (Charc);
while (elt < end)
{
while (elt < end)
{
@@
-492,7
+492,7
@@
x_output_display_block (struct window *w, struct display_line *dl, int block,
case IMAGE_TEXT:
case IMAGE_POINTER:
default:
case IMAGE_TEXT:
case IMAGE_POINTER:
default:
- abort ();
+ ABORT ();
}
IMAGE_INSTANCE_OPTIMIZE_OUTPUT
(XIMAGE_INSTANCE (instance)) = 0;
}
IMAGE_INSTANCE_OPTIMIZE_OUTPUT
(XIMAGE_INSTANCE (instance)) = 0;
@@
-502,7
+502,7
@@
x_output_display_block (struct window *w, struct display_line *dl, int block,
elt++;
}
else
elt++;
}
else
- abort ();
+ ABORT ();
}
}
}
}
@@
-982,8
+982,9
@@
x_output_string (struct window *w, struct display_line *dl,
/* We draw underlines in the same color as the text. */
if (cachel->underline)
{
/* We draw underlines in the same color as the text. */
if (cachel->underline)
{
- unsigned long upos;
- unsigned long uthick;
+ /* upos is naturally signed, why would anyone think otherwise?
+ uthick is signed to avoid unsigned propagation. */
+ long upos, uthick;
XFontStruct *xfont;
xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
XFontStruct *xfont;
xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
@@
-1011,7
+1012,9
@@
x_output_string (struct window *w, struct display_line *dl,
}
if (cachel->strikethru) {
}
if (cachel->strikethru) {
- unsigned long ascent,descent,upos, uthick;
+ /* ascent, descent, and upos are naturally signed; why would anyone
+ think otherwise? uthick is signed to avoid unsigned propagation. */
+ long ascent, descent, upos, uthick;
XFontStruct *xfont;
xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
XFontStruct *xfont;
xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));