[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: |
Mon, 24 Apr 2006 00:08:07 +0000 |
Index: emacs/src/xdisp.c
diff -u emacs/src/xdisp.c:1.1092 emacs/src/xdisp.c:1.1093
--- emacs/src/xdisp.c:1.1092 Sun Apr 23 23:50:25 2006
+++ emacs/src/xdisp.c Mon Apr 24 00:08:07 2006
@@ -19865,12 +19865,30 @@
&& it->current_x + width > it->last_visible_x)
width = it->last_visible_x - it->current_x - 1;
- if (width > 0 && height > 0 && it->glyph_row)
+ if (width > 0 && height > 0)
{
- Lisp_Object object = it->stack[it->sp - 1].string;
- if (!STRINGP (object))
- object = it->w->buffer;
- append_stretch_glyph (it, object, width, height, ascent);
+
+ if (face->box != FACE_NO_BOX && face->box_line_width != 0)
+ {
+ if (face->box_line_width > 0)
+ {
+ ascent += face->box_line_width;
+ height += face->box_line_width * 2;
+ }
+
+ if (it->start_of_box_run_p)
+ width += abs (face->box_line_width);
+ if (it->end_of_box_run_p)
+ width += abs (face->box_line_width);
+ }
+
+ if (it->glyph_row)
+ {
+ Lisp_Object object = it->stack[it->sp - 1].string;
+ if (!STRINGP (object))
+ object = it->w->buffer;
+ append_stretch_glyph (it, object, width, height, ascent);
+ }
}
it->pixel_width = width;
@@ -19878,20 +19896,6 @@
it->descent = it->phys_descent = height - it->ascent;
it->nglyphs = width > 0 && height > 0 ? 1 : 0;
- if (width > 0 && height > 0 && face->box != FACE_NO_BOX)
- {
- if (face->box_line_width > 0)
- {
- it->ascent += face->box_line_width;
- it->descent += face->box_line_width;
- }
-
- if (it->start_of_box_run_p)
- it->pixel_width += abs (face->box_line_width);
- if (it->end_of_box_run_p)
- it->pixel_width += abs (face->box_line_width);
- }
-
take_vertical_position_into_account (it);
}
- [Emacs-diffs] Changes to emacs/src/xdisp.c, YAMAMOTO Mitsuharu, 2006/04/12
- [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 <=
- [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