projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git.1]
/
src
/
redisplay-output.c
diff --git
a/src/redisplay-output.c
b/src/redisplay-output.c
index
fc0b5c3
..
f61e238
100644
(file)
--- a/
src/redisplay-output.c
+++ b/
src/redisplay-output.c
@@
-334,7
+334,7
@@
get_next_display_block (layout_bounds bounds, display_block_dynarr *dba,
else if (start_pos <= bounds.right_out)
*next_start = bounds.right_out;
else
else if (start_pos <= bounds.right_out)
*next_start = bounds.right_out;
else
- abort ();
+ ABORT ();
}
for (block = 0; block < Dynarr_length (dba); block++)
}
for (block = 0; block < Dynarr_length (dba); block++)
@@
-377,7
+377,7
@@
get_cursor_size_and_location (struct window *w, struct display_block *db,
int defheight, defwidth;
if (Dynarr_length (db->runes) <= cursor_location)
int defheight, defwidth;
if (Dynarr_length (db->runes) <= cursor_location)
- abort ();
+ ABORT ();
XSETWINDOW (window, w);
XSETWINDOW (window, w);
@@
-1317,7
+1317,7
@@
redisplay_output_layout (Lisp_Object domain,
{
Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Lisp_Object rest, window = DOMAIN_WINDOW (domain);
{
Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Lisp_Object rest, window = DOMAIN_WINDOW (domain);
- Charc_dynarr *buf = Dynarr_new (Charc);
+ Charc_dynarr *buf;
struct window *w = XWINDOW (window);
struct device *d = DOMAIN_XDEVICE (domain);
int layout_height, layout_width;
struct window *w = XWINDOW (window);
struct device *d = DOMAIN_XDEVICE (domain);
int layout_height, layout_width;
@@
-1334,6
+1334,8
@@
redisplay_output_layout (Lisp_Object domain,
if (!redisplay_normalize_glyph_area (db, dga))
return;
if (!redisplay_normalize_glyph_area (db, dga))
return;
+ buf = Dynarr_new (Charc);
+
/* Highly dodgy optimization. We want to only output the whole
layout if we really have to. */
if (!IMAGE_INSTANCE_OPTIMIZE_OUTPUT (p)
/* Highly dodgy optimization. We want to only output the whole
layout if we really have to. */
if (!IMAGE_INSTANCE_OPTIMIZE_OUTPUT (p)
@@
-1521,7
+1523,7
@@
redisplay_output_layout (Lisp_Object domain,
case IMAGE_POINTER:
default:
case IMAGE_POINTER:
default:
- abort ();
+ ABORT ();
}
}
IMAGE_INSTANCE_OPTIMIZE_OUTPUT (childii) = 0;
}
}
IMAGE_INSTANCE_OPTIMIZE_OUTPUT (childii) = 0;
@@
-1633,7
+1635,7
@@
redisplay_clear_region (Lisp_Object locale, face_index findex, int x, int y,
f = XFRAME (locale);
}
else
f = XFRAME (locale);
}
else
- abort ();
+ ABORT ();
d = XDEVICE (f->device);
d = XDEVICE (f->device);