diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0a14ebc4e55..de11b21c9e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-10-23 Juanma Barranquero <lekktu@gmail.com> + + * xdisp.c (fill_glyph_string): Fix typo in source (though the + poor beast has survived 9+ years and the jump from xterm.c!). + 2008-10-23 Martin Rudalics <rudalics@gmx.at> * buffer.c (Fget_buffer_create): Rename arg to buffer_or_name. diff --git a/src/xdisp.c b/src/xdisp.c index 1794a6d3c02..f8fce43ad34 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -6607,7 +6607,7 @@ next_element_from_composition (it) it->object = it->w->buffer; it->c = composition_update_it (&it->cmp_it, IT_CHARPOS (*it), IT_BYTEPOS (*it), Qnil); - } + } return 1; } @@ -8271,7 +8271,7 @@ ensure_echo_area_buffers () sprintf (name, " *Echo Area %d*", i); echo_buffer[i] = Fget_buffer_create (build_string (name)); XBUFFER (echo_buffer[i])->truncate_lines = Qnil; - /* to force word wrap in echo area - + /* to force word wrap in echo area - it was decided to postpone this*/ /* XBUFFER (echo_buffer[i])->word_wrap = Qt; */ @@ -19711,7 +19711,7 @@ fill_glyph_string (s, face_id, start, end, overlaps) xassert (s->nchars == 0); xassert (start >= 0 && end > start); - s->for_overlaps = overlaps, + s->for_overlaps = overlaps; glyph = s->row->glyphs[s->area] + start; last = s->row->glyphs[s->area] + end; voffset = glyph->voffset; |