[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dispextern.h,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/src/dispextern.h,v |
Date: |
Fri, 19 Sep 2008 03:35:58 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/09/19 03:35:57
Index: dispextern.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -b -r1.259 -r1.260
--- dispextern.h 9 Sep 2008 11:09:10 -0000 1.259
+++ dispextern.h 19 Sep 2008 03:35:57 -0000 1.260
@@ -2042,9 +2042,9 @@
unsigned avoid_cursor_p : 1;
/* properties from display property that are reset by another display
property. */
+ short voffset;
Lisp_Object space_width;
Lisp_Object font_height;
- short voffset;
}
stack[IT_STACK_SIZE];
@@ -2069,8 +2069,6 @@
where the `^' can be replaced by a display table entry. */
unsigned ctl_arrow_p : 1;
- enum line_wrap_method line_wrap;
-
/* Non-zero means that the current face has a box. */
unsigned face_box_p : 1;
@@ -2106,6 +2104,8 @@
descent/ascent (line-height property). Reset after this glyph. */
unsigned constrain_row_ascent_descent_p : 1;
+ enum line_wrap_method line_wrap;
+
/* The ID of the default face to use. One of DEFAULT_FACE_ID,
MODE_LINE_FACE_ID, etc, depending on what we are displaying. */
int base_face_id;
@@ -2140,6 +2140,9 @@
/* Computed from the value of the `raise' property. */
short voffset;
+ /* Number of columns per \t. */
+ short tab_width;
+
/* Value of the `height' property, if any; nil if none. */
Lisp_Object font_height;
@@ -2150,9 +2153,6 @@
Lisp_Object object;
struct text_pos position;
- /* Number of columns per \t. */
- short tab_width;
-
/* Width in pixels of truncation and continuation glyphs. */
short truncation_pixel_width, continuation_pixel_width;