summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2012-06-01 12:14:07 +0300
committerEli Zaretskii <eliz@gnu.org>2012-06-01 12:14:07 +0300
commit2517bc14d39b64a30b03cbfa13e5619260dff3e7 (patch)
tree351245fcee9d496eb7bd734a23d05e5737824c99
parentdd41169b6cb0105b0766f3d368c657ebafc19cba (diff)
downloademacs-2517bc14d39b64a30b03cbfa13e5619260dff3e7.tar.gz
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
struct display_pos current;
/* Total number of overlay strings to process. This can be >
- OVERLAY_STRING_CHUNK_SIZE. */
+ OVERLAY_STRING_CHUNK_SIZE. Value is dependable only when
+ current.overlay_string_index >= 0. Use the latter to determine
+ whether an overlay string is being iterated over, because
+ n_overlay_strings can be positive even when we are not rendering
+ an overlay string. */
int n_overlay_strings;
/* The charpos where n_overlay_strings was calculated. This should
@@ -2227,7 +2231,8 @@ struct it
/* If non-nil, a Lisp string being processed. If
current.overlay_string_index >= 0, this is an overlay string from
- pos. */
+ pos. Use STRINGP(it.string) as a test for whether we are
+ rendering a string or something else; do NOT use BUFFERP(it.object). */
Lisp_Object string;
/* If non-nil, we are processing a string that came
@@ -2416,6 +2421,9 @@ struct it
and continuation glyphs, or blanks that extend each line to the
edge of the window on a TTY.
+ Do NOT use !BUFFERP (it.object) as a test whether we are
+ iterating over a string; use STRINGP (it.string) instead.
+
Position is the current iterator position in object. */
Lisp_Object object;
struct text_pos position;