projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(M-42216): Unify M042216.
[chise/xemacs-chise.git-]
/
src
/
redisplay-x.c
diff --git
a/src/redisplay-x.c
b/src/redisplay-x.c
index
3df981c
..
68ceb56
100644
(file)
--- a/
src/redisplay-x.c
+++ b/
src/redisplay-x.c
@@
-174,9
+174,9
@@
separate_textual_runs (unsigned char *text_storage,
#ifdef MULE
{
Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset);
#ifdef MULE
{
Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset);
- need_ccl_conversion = !NILP (ccl_prog);
- if (need_ccl_conversion)
- setup_ccl_program (&char_converter, ccl_prog);
+ if ((!NILP (ccl_prog))
+ && (setup_ccl_program (&char_converter, ccl_prog) >= 0))
+ need_ccl_conversion = 1;
}
#endif
}
}
#endif
}
@@
-468,12
+468,12
@@
x_output_display_block (struct window *w, struct display_line *dl, int block,
cursor_start, cursor_width,
cursor_height, 0);
break;
cursor_start, cursor_width,
cursor_height, 0);
break;
-
+
case IMAGE_WIDGET:
if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
Qlayout))
{
case IMAGE_WIDGET:
if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
Qlayout))
{
- redisplay_output_layout (w, instance, &dbox, &dga, findex,
+ redisplay_output_layout (window, instance, &dbox, &dga, findex,
cursor_start, cursor_width,
cursor_height);
break;
cursor_start, cursor_width,
cursor_height);
break;
@@
-483,17
+483,17
@@
x_output_display_block (struct window *w, struct display_line *dl, int block,
cursor_start, cursor_width,
cursor_height);
break;
cursor_start, cursor_width,
cursor_height);
break;
-
+
case IMAGE_NOTHING:
/* nothing is as nothing does */
break;
case IMAGE_NOTHING:
/* nothing is as nothing does */
break;
-
+
case IMAGE_TEXT:
case IMAGE_POINTER:
default:
abort ();
}
case IMAGE_TEXT:
case IMAGE_POINTER:
default:
abort ();
}
- IMAGE_INSTANCE_OPTIMIZE_OUTPUT
+ IMAGE_INSTANCE_OPTIMIZE_OUTPUT
(XIMAGE_INSTANCE (instance)) = 0;
}
(XIMAGE_INSTANCE (instance)) = 0;
}
@@
-2010,7
+2010,7
@@
x_flash (struct device *d)
w->pixel_width, flash_height);
}
else
w->pixel_width, flash_height);
}
else
- /* If it is short, flash it all. */
+ /* If it is short, flash it all. */
XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
w->pixel_width, w->pixel_height);
XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
w->pixel_width, w->pixel_height);
@@
-2043,7
+2043,7
@@
x_flash (struct device *d)
w->pixel_width, flash_height);
}
else
w->pixel_width, flash_height);
}
else
- /* If it is short, flash it all. */
+ /* If it is short, flash it all. */
XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
w->pixel_width, w->pixel_height);
XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
w->pixel_width, w->pixel_height);