Mercurial > emacs
comparison src/dispextern.h @ 106550:562676f8dfb2
(struct text_pos): Use EMACS_INT;
(struct glyph): Use EMACS_INT for charpos.
(struct it): Use EMACS_INT for stop_charpos, end_charpos, region_beg_charpos,
region_end_charpos, redisplay_end_trigger_charpos, and also for
iterator_stack_entry.end_charpos and iterator_stack_entry.stop_charpos.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 12 Dec 2009 13:40:43 +0000 |
parents | 4f644fac017c |
children | 1d1d5d9bd884 f35e7896a0fe |
comparison
equal
deleted
inserted
replaced
106549:3acd32c3e0ac | 106550:562676f8dfb2 |
---|---|
171 following structure holds such a pair of positions. */ | 171 following structure holds such a pair of positions. */ |
172 | 172 |
173 struct text_pos | 173 struct text_pos |
174 { | 174 { |
175 /* Character position. */ | 175 /* Character position. */ |
176 int charpos; | 176 EMACS_INT charpos; |
177 | 177 |
178 /* Corresponding byte position. */ | 178 /* Corresponding byte position. */ |
179 int bytepos; | 179 EMACS_INT bytepos; |
180 }; | 180 }; |
181 | 181 |
182 /* Access character and byte position of POS in a functional form. */ | 182 /* Access character and byte position of POS in a functional form. */ |
183 | 183 |
184 #define BYTEPOS(POS) (POS).bytepos | 184 #define BYTEPOS(POS) (POS).bytepos |
309 /* Position from which this glyph was drawn. If `object' below is a | 309 /* Position from which this glyph was drawn. If `object' below is a |
310 Lisp string, this is a position in that string. If it is a | 310 Lisp string, this is a position in that string. If it is a |
311 buffer, this is a position in that buffer. A value of -1 | 311 buffer, this is a position in that buffer. A value of -1 |
312 together with a null object means glyph is a truncation glyph at | 312 together with a null object means glyph is a truncation glyph at |
313 the start of a row. */ | 313 the start of a row. */ |
314 int charpos; | 314 EMACS_INT charpos; |
315 | 315 |
316 /* Lisp object source of this glyph. Currently either a buffer or | 316 /* Lisp object source of this glyph. Currently either a buffer or |
317 a string, if the glyph was produced from characters which came from | 317 a string, if the glyph was produced from characters which came from |
318 a buffer or a string; or 0 if the glyph was inserted by redisplay | 318 a buffer or a string; or 0 if the glyph was inserted by redisplay |
319 for its own purposes such as padding. */ | 319 for its own purposes such as padding. */ |
1898 /* Method to use to load this structure with the next display element. */ | 1898 /* Method to use to load this structure with the next display element. */ |
1899 enum it_method method; | 1899 enum it_method method; |
1900 | 1900 |
1901 /* The next position at which to check for face changes, invisible | 1901 /* The next position at which to check for face changes, invisible |
1902 text, overlay strings, end of text etc., which see. */ | 1902 text, overlay strings, end of text etc., which see. */ |
1903 int stop_charpos; | 1903 EMACS_INT stop_charpos; |
1904 | 1904 |
1905 /* Maximum string or buffer position + 1. ZV when iterating over | 1905 /* Maximum string or buffer position + 1. ZV when iterating over |
1906 current_buffer. */ | 1906 current_buffer. */ |
1907 int end_charpos; | 1907 EMACS_INT end_charpos; |
1908 | 1908 |
1909 /* C string to iterate over. Non-null means get characters from | 1909 /* C string to iterate over. Non-null means get characters from |
1910 this string, otherwise characters are read from current_buffer | 1910 this string, otherwise characters are read from current_buffer |
1911 or it->string. */ | 1911 or it->string. */ |
1912 unsigned char *s; | 1912 unsigned char *s; |
1915 over. */ | 1915 over. */ |
1916 int string_nchars; | 1916 int string_nchars; |
1917 | 1917 |
1918 /* Start and end of a visible region; -1 if the region is not | 1918 /* Start and end of a visible region; -1 if the region is not |
1919 visible in the window. */ | 1919 visible in the window. */ |
1920 int region_beg_charpos, region_end_charpos; | 1920 EMACS_INT region_beg_charpos, region_end_charpos; |
1921 | 1921 |
1922 /* Position at which redisplay end trigger functions should be run. */ | 1922 /* Position at which redisplay end trigger functions should be run. */ |
1923 int redisplay_end_trigger_charpos; | 1923 EMACS_INT redisplay_end_trigger_charpos; |
1924 | 1924 |
1925 /* 1 means multibyte characters are enabled. */ | 1925 /* 1 means multibyte characters are enabled. */ |
1926 unsigned multibyte_p : 1; | 1926 unsigned multibyte_p : 1; |
1927 | 1927 |
1928 /* 1 means window has a mode line at its top. */ | 1928 /* 1 means window has a mode line at its top. */ |
2004 from what we previously had. */ | 2004 from what we previously had. */ |
2005 struct iterator_stack_entry | 2005 struct iterator_stack_entry |
2006 { | 2006 { |
2007 Lisp_Object string; | 2007 Lisp_Object string; |
2008 int string_nchars; | 2008 int string_nchars; |
2009 int end_charpos; | 2009 EMACS_INT end_charpos; |
2010 int stop_charpos; | 2010 EMACS_INT stop_charpos; |
2011 struct composition_it cmp_it; | 2011 struct composition_it cmp_it; |
2012 int face_id; | 2012 int face_id; |
2013 | 2013 |
2014 /* Save values specific to a given method. */ | 2014 /* Save values specific to a given method. */ |
2015 union { | 2015 union { |