aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2008-06-24 17:56:41 +0000
committerChong Yidong2008-06-24 17:56:41 +0000
commitbf7a8847fee4c005e578fd8357d0e64618628bb0 (patch)
tree6b60dd5d6281a1a65980e563796271bc825fb680 /src
parent0858cd02f0a115c4ad7e6c5ce92b545e662b7687 (diff)
downloademacs-bf7a8847fee4c005e578fd8357d0e64618628bb0.tar.gz
emacs-bf7a8847fee4c005e578fd8357d0e64618628bb0.zip
(struct it): Replace bool truncate_lines_p with a line_wrap enum
possessing three possible values.
Diffstat (limited to 'src')
-rw-r--r--src/dispextern.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 8ea9ab4c3e5..1761bede3e2 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1804,6 +1804,14 @@ enum prop_idx
1804 LAST_PROP_IDX 1804 LAST_PROP_IDX
1805}; 1805};
1806 1806
1807/* An enumerator for the method of wrapping long lines. */
1808
1809enum line_wrap_method
1810{
1811 TRUNCATE,
1812 WORD_WRAP,
1813 WINDOW_WRAP
1814};
1807 1815
1808struct it_slice 1816struct it_slice
1809{ 1817{
@@ -2008,8 +2016,7 @@ struct it
2008 where the `^' can be replaced by a display table entry. */ 2016 where the `^' can be replaced by a display table entry. */
2009 unsigned ctl_arrow_p : 1; 2017 unsigned ctl_arrow_p : 1;
2010 2018
2011 /* 1 means lines are truncated. */ 2019 enum line_wrap_method line_wrap;
2012 unsigned truncate_lines_p : 1;
2013 2020
2014 /* Non-zero means that the current face has a box. */ 2021 /* Non-zero means that the current face has a box. */
2015 unsigned face_box_p : 1; 2022 unsigned face_box_p : 1;