aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-10-23 10:33:05 +0000
committerJuanma Barranquero2008-10-23 10:33:05 +0000
commit878a45845f75dfcfe2a78ca2259ed9e46ff8b73d (patch)
tree7a5a1f7acaa1ddc69291f0f9e4194b84f2df32d8
parent4d48fcdc0f06e4d0061c57d2ae79e2e77c71cb36 (diff)
downloademacs-878a45845f75dfcfe2a78ca2259ed9e46ff8b73d.tar.gz
emacs-878a45845f75dfcfe2a78ca2259ed9e46ff8b73d.zip
* xdisp.c (fill_glyph_string): Fix typo in source (though the
poor beast has survived 9+ years and the jump from xterm.c!).
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c6
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 @@
12008-10-23 Juanma Barranquero <lekktu@gmail.com>
2
3 * xdisp.c (fill_glyph_string): Fix typo in source (though the
4 poor beast has survived 9+ years and the jump from xterm.c!).
5
12008-10-23 Martin Rudalics <rudalics@gmx.at> 62008-10-23 Martin Rudalics <rudalics@gmx.at>
2 7
3 * buffer.c (Fget_buffer_create): Rename arg to buffer_or_name. 8 * 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)
6607 it->object = it->w->buffer; 6607 it->object = it->w->buffer;
6608 it->c = composition_update_it (&it->cmp_it, IT_CHARPOS (*it), 6608 it->c = composition_update_it (&it->cmp_it, IT_CHARPOS (*it),
6609 IT_BYTEPOS (*it), Qnil); 6609 IT_BYTEPOS (*it), Qnil);
6610 } 6610 }
6611 return 1; 6611 return 1;
6612} 6612}
6613 6613
@@ -8271,7 +8271,7 @@ ensure_echo_area_buffers ()
8271 sprintf (name, " *Echo Area %d*", i); 8271 sprintf (name, " *Echo Area %d*", i);
8272 echo_buffer[i] = Fget_buffer_create (build_string (name)); 8272 echo_buffer[i] = Fget_buffer_create (build_string (name));
8273 XBUFFER (echo_buffer[i])->truncate_lines = Qnil; 8273 XBUFFER (echo_buffer[i])->truncate_lines = Qnil;
8274 /* to force word wrap in echo area - 8274 /* to force word wrap in echo area -
8275 it was decided to postpone this*/ 8275 it was decided to postpone this*/
8276 /* XBUFFER (echo_buffer[i])->word_wrap = Qt; */ 8276 /* XBUFFER (echo_buffer[i])->word_wrap = Qt; */
8277 8277
@@ -19711,7 +19711,7 @@ fill_glyph_string (s, face_id, start, end, overlaps)
19711 xassert (s->nchars == 0); 19711 xassert (s->nchars == 0);
19712 xassert (start >= 0 && end > start); 19712 xassert (start >= 0 && end > start);
19713 19713
19714 s->for_overlaps = overlaps, 19714 s->for_overlaps = overlaps;
19715 glyph = s->row->glyphs[s->area] + start; 19715 glyph = s->row->glyphs[s->area] + start;
19716 last = s->row->glyphs[s->area] + end; 19716 last = s->row->glyphs[s->area] + end;
19717 voffset = glyph->voffset; 19717 voffset = glyph->voffset;