[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c |
Date: |
Wed, 12 Apr 2006 08:10:34 +0000 |
Index: emacs/src/xdisp.c
diff -u emacs/src/xdisp.c:1.1084 emacs/src/xdisp.c:1.1085
--- emacs/src/xdisp.c:1.1084 Thu Mar 30 19:35:11 2006
+++ emacs/src/xdisp.c Wed Apr 12 08:10:33 2006
@@ -1910,7 +1910,7 @@
}
if ((s->for_overlaps & OVERLAPS_BOTH) == 0
- || (s->for_overlaps & OVERLAPS_BOTH) == OVERLAPS_BOTH && n == 1)
+ || ((s->for_overlaps & OVERLAPS_BOTH) == OVERLAPS_BOTH && n == 1))
{
#ifdef CONVERT_FROM_XRECT
CONVERT_FROM_XRECT (r, *rects);
@@ -1936,23 +1936,27 @@
{
rs[i] = r;
if (r.y + r.height > row_y)
- if (r.y < row_y)
- rs[i].height = row_y - r.y;
- else
- rs[i].height = 0;
+ {
+ if (r.y < row_y)
+ rs[i].height = row_y - r.y;
+ else
+ rs[i].height = 0;
+ }
i++;
}
if (s->for_overlaps & OVERLAPS_SUCC)
{
rs[i] = r;
if (r.y < row_y + s->row->visible_height)
- if (r.y + r.height > row_y + s->row->visible_height)
- {
- rs[i].y = row_y + s->row->visible_height;
- rs[i].height = r.y + r.height - rs[i].y;
- }
- else
- rs[i].height = 0;
+ {
+ if (r.y + r.height > row_y + s->row->visible_height)
+ {
+ rs[i].y = row_y + s->row->visible_height;
+ rs[i].height = r.y + r.height - rs[i].y;
+ }
+ else
+ rs[i].height = 0;
+ }
i++;
}
@@ -14864,7 +14868,7 @@
{
if (glyphs != 1)
{
- fprintf (stderr, "Row Start End Used oEI><\\CTZFesm X Y W
H V A P\n");
+ fprintf (stderr, "Row Start End Used oE><\\CTZFesm X Y W
H V A P\n");
fprintf (stderr,
"======================================================================\n");
fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d\
- [Emacs-diffs] Changes to emacs/src/xdisp.c,
YAMAMOTO Mitsuharu <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Nick Roberts, 2006/04/12
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F. Storm, 2006/04/19
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F. Storm, 2006/04/20
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Nick Roberts, 2006/04/20
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F. Storm, 2006/04/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F. Storm, 2006/04/23
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F. Storm, 2006/04/23
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F. Storm, 2006/04/23
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F. Storm, 2006/04/23
- [Emacs-diffs] Changes to emacs/src/xdisp.c, YAMAMOTO Mitsuharu, 2006/04/30