[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c |
Date: |
Tue, 09 Nov 2004 08:32:07 -0500 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.927 emacs/src/xdisp.c:1.928
*** emacs/src/xdisp.c:1.927 Mon Nov 8 22:25:30 2004
--- emacs/src/xdisp.c Tue Nov 9 13:26:01 2004
***************
*** 16041,16067 ****
{
tenths = remainder / 100;
if (50 <= remainder % 100)
! if (tenths < 9)
! tenths++;
! else
! {
! quotient++;
! if (quotient == 10)
! tenths = -1;
! else
! tenths = 0;
! }
}
else
if (500 <= remainder)
! if (quotient < 999)
! quotient++;
! else
! {
! quotient = 1;
! exponent++;
! tenths = 0;
! }
}
/* Calculate the LENGTH of QUOTIENT.TENTHS as a string. */
--- 16041,16071 ----
{
tenths = remainder / 100;
if (50 <= remainder % 100)
! {
! if (tenths < 9)
! tenths++;
! else
! {
! quotient++;
! if (quotient == 10)
! tenths = -1;
! else
! tenths = 0;
! }
! }
}
else
if (500 <= remainder)
! {
! if (quotient < 999)
! quotient++;
! else
! {
! quotient = 1;
! exponent++;
! tenths = 0;
! }
! }
}
/* Calculate the LENGTH of QUOTIENT.TENTHS as a string. */
***************
*** 18348,18354 ****
{
struct image *img;
struct face *face;
! int face_ascent, glyph_ascent;
struct glyph_slice slice;
xassert (it->what == IT_IMAGE);
--- 18352,18358 ----
{
struct image *img;
struct face *face;
! int glyph_ascent;
struct glyph_slice slice;
xassert (it->what == IT_IMAGE);
***************
*** 18431,18437 ****
#if 0 /* this breaks image tiling */
/* If this glyph is alone on the last line, adjust it.ascent to minimum row
ascent. */
! face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET
(it->f);
if (face_ascent > it->ascent)
it->ascent = it->phys_ascent = face_ascent;
#endif
--- 18435,18441 ----
#if 0 /* this breaks image tiling */
/* If this glyph is alone on the last line, adjust it.ascent to minimum row
ascent. */
! int face_ascent = face->font ? FONT_BASE (face->font) :
FRAME_BASELINE_OFFSET (it->f);
if (face_ascent > it->ascent)
it->ascent = it->phys_ascent = face_ascent;
#endif
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/11/02
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c,
Kim F . Storm <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/12
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/12
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/11/13
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/11/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kenichi Handa, 2004/11/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Stefan Monnier, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Luc Teirlinck, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/18