aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-06-01 12:14:07 +0300
committerEli Zaretskii2012-06-01 12:14:07 +0300
commit2517bc14d39b64a30b03cbfa13e5619260dff3e7 (patch)
tree351245fcee9d496eb7bd734a23d05e5737824c99
parentdd41169b6cb0105b0766f3d368c657ebafc19cba (diff)
downloademacs-2517bc14d39b64a30b03cbfa13e5619260dff3e7.tar.gz
emacs-2517bc14d39b64a30b03cbfa13e5619260dff3e7.zip
Improve commentary to 'struct it' in src/dispextern.h.
-rw-r--r--src/dispextern.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 4804a9e61c6..f3266313df3 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2208,7 +2208,11 @@ struct it
2208 struct display_pos current; 2208 struct display_pos current;
2209 2209
2210 /* Total number of overlay strings to process. This can be > 2210 /* Total number of overlay strings to process. This can be >
2211 OVERLAY_STRING_CHUNK_SIZE. */ 2211 OVERLAY_STRING_CHUNK_SIZE. Value is dependable only when
2212 current.overlay_string_index >= 0. Use the latter to determine
2213 whether an overlay string is being iterated over, because
2214 n_overlay_strings can be positive even when we are not rendering
2215 an overlay string. */
2212 int n_overlay_strings; 2216 int n_overlay_strings;
2213 2217
2214 /* The charpos where n_overlay_strings was calculated. This should 2218 /* The charpos where n_overlay_strings was calculated. This should
@@ -2227,7 +2231,8 @@ struct it
2227 2231
2228 /* If non-nil, a Lisp string being processed. If 2232 /* If non-nil, a Lisp string being processed. If
2229 current.overlay_string_index >= 0, this is an overlay string from 2233 current.overlay_string_index >= 0, this is an overlay string from
2230 pos. */ 2234 pos. Use STRINGP(it.string) as a test for whether we are
2235 rendering a string or something else; do NOT use BUFFERP(it.object). */
2231 Lisp_Object string; 2236 Lisp_Object string;
2232 2237
2233 /* If non-nil, we are processing a string that came 2238 /* If non-nil, we are processing a string that came
@@ -2416,6 +2421,9 @@ struct it
2416 and continuation glyphs, or blanks that extend each line to the 2421 and continuation glyphs, or blanks that extend each line to the
2417 edge of the window on a TTY. 2422 edge of the window on a TTY.
2418 2423
2424 Do NOT use !BUFFERP (it.object) as a test whether we are
2425 iterating over a string; use STRINGP (it.string) instead.
2426
2419 Position is the current iterator position in object. */ 2427 Position is the current iterator position in object. */
2420 Lisp_Object object; 2428 Lisp_Object object;
2421 struct text_pos position; 2429 struct text_pos position;