aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2008-12-29 04:53:10 +0000
committerDan Nicolaescu2008-12-29 04:53:10 +0000
commit31e0750eac2513ac05a74283fe56ce883991246c (patch)
tree81916764c8d443a1a3686800736b7e9db0e61251 /src
parentbd7bbf294efbe3745cb596e9555150e044cf6ed0 (diff)
downloademacs-31e0750eac2513ac05a74283fe56ce883991246c.tar.gz
emacs-31e0750eac2513ac05a74283fe56ce883991246c.zip
(struct face): Move lface and hash from the middle
of bitfields.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/dispextern.h14
2 files changed, 10 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2cdf55d9cf4..46d35f7f763 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12008-12-29 Dan Nicolaescu <dann@ics.uci.edu> 12008-12-29 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * dispextern.h (struct face): Move lface and hash from the middle
4 of bitfields.
5
3 * Makefile.in (INTERVALS_H): Rename from INTERVAL_SRC, update all users. 6 * Makefile.in (INTERVALS_H): Rename from INTERVAL_SRC, update all users.
4 7
52008-12-29 Dan Nicolaescu <dann@ics.uci.edu> 82008-12-29 Dan Nicolaescu <dann@ics.uci.edu>
diff --git a/src/dispextern.h b/src/dispextern.h
index ef66006cc08..4c6d20c2ede 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1524,13 +1524,6 @@ struct face
1524 drawing shadows. */ 1524 drawing shadows. */
1525 unsigned use_box_color_for_shadows_p : 1; 1525 unsigned use_box_color_for_shadows_p : 1;
1526 1526
1527 /* The Lisp face attributes this face realizes. All attributes
1528 in this vector are non-nil. */
1529 Lisp_Object lface[LFACE_VECTOR_SIZE];
1530
1531 /* The hash value of this face. */
1532 unsigned hash;
1533
1534 /* Non-zero if text in this face should be underlined, overlined, 1527 /* Non-zero if text in this face should be underlined, overlined,
1535 strike-through or have a box drawn around it. */ 1528 strike-through or have a box drawn around it. */
1536 unsigned underline_p : 1; 1529 unsigned underline_p : 1;
@@ -1580,6 +1573,13 @@ struct face
1580 unsigned synth_ital : 1; 1573 unsigned synth_ital : 1;
1581#endif 1574#endif
1582 1575
1576 /* The Lisp face attributes this face realizes. All attributes
1577 in this vector are non-nil. */
1578 Lisp_Object lface[LFACE_VECTOR_SIZE];
1579
1580 /* The hash value of this face. */
1581 unsigned hash;
1582
1583 /* Next and previous face in hash collision list of face cache. */ 1583 /* Next and previous face in hash collision list of face cache. */
1584 struct face *next, *prev; 1584 struct face *next, *prev;
1585 1585