[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c,v |
Date: |
Fri, 08 Aug 2008 15:43:46 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/08/08 15:43:46
Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1244
retrieving revision 1.1245
diff -u -b -r1.1244 -r1.1245
--- xdisp.c 7 Aug 2008 01:54:06 -0000 1.1244
+++ xdisp.c 8 Aug 2008 15:43:45 -0000 1.1245
@@ -7296,6 +7296,30 @@
out:
+ /* On text terminals, we may stop at the end of a line in the middle
+ of a multi-character glyph. If the glyph itself is continued,
+ i.e. it is actually displayed on the next line, don't treat this
+ stopping point as valid; move to the next line instead (unless
+ that brings us offscreen). */
+ if (!FRAME_WINDOW_P (it->f)
+ && op & MOVE_TO_POS
+ && IT_CHARPOS (*it) == to_charpos
+ && it->what == IT_CHARACTER
+ && it->nglyphs > 1
+ && it->line_wrap == WINDOW_WRAP
+ && it->current_x == it->last_visible_x - 1
+ && it->c != '\n'
+ && it->c != '\t'
+ && it->vpos < XFASTINT (it->w->window_end_vpos))
+ {
+ it->continuation_lines_width += it->current_x;
+ it->current_x = it->hpos = it->max_ascent = it->max_descent = 0;
+ it->current_y += it->max_ascent + it->max_descent;
+ ++it->vpos;
+ last_height = it->max_ascent + it->max_descent;
+ last_max_ascent = it->max_ascent;
+ }
+
TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached));
}
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Adrian Robert, 2008/08/04
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/08/05
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/08/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/08/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/08/11
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/08/17
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/08/22
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Eli Zaretskii, 2008/08/23
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2008/08/28
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Glenn Morris, 2008/08/29
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kenichi Handa, 2008/08/29
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Martin Rudalics, 2008/08/31