Mercurial > emacs
diff src/term.c @ 90260:0ca0d9181b5e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-95
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 598-615)
- Update from CVS
- Remove lisp/toolbar directory
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 142-146)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 16 Jan 2006 06:59:21 +0000 |
| parents | 2d92f5c9d6ae d3f5aa0f18c4 |
| children | 7beb78bc1f8e |
line wrap: on
line diff
--- a/src/term.c Wed Dec 28 07:22:57 2005 +0000 +++ b/src/term.c Mon Jan 16 06:59:21 2006 +0000 @@ -820,7 +820,7 @@ int src_len; struct coding_system *coding; { - struct glyph *src_start = src, *src_end = src + src_len; + struct glyph *src_end = src + src_len; register GLYPH g; unsigned char *buf; int nchars, nbytes, required; @@ -1836,7 +1836,7 @@ && calc_pixel_width_or_height (&tem, it, prop, 0, 1, &align_to)) { if (it->glyph_row == NULL || !it->glyph_row->mode_line_p) - align_to = (align_to < 0 + align_to = (align_to < 0 ? 0 : align_to - window_box_left_offset (it->w, TEXT_AREA)); else if (align_to < 0)