[Emacs-diffs] /srv/bzr/emacs/trunk r106526: Clarify documentation of wrap-prefix and line-prefix.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106526
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-26 16:07:22 +0200
message:
  Clarify documentation of wrap-prefix and line-prefix.
  
   doc/lispref/display.texi (Truncation):
   doc/lispref/text.texi (Special Properties): Describe what a stretch-glyph is
   instead of using that term without explanation.  Make the
   cross-references more accurate.
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi
  doc/lispref/text.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-11-26 13:51:58 +0000
+++ b/doc/lispref/ChangeLog     2011-11-26 14:07:22 +0000
@@ -1,5 +1,10 @@
 2011-11-26  Eli Zaretskii  <address@hidden>
 
+       * display.texi (Truncation):
+       * text.texi (Special Properties): Describe what a stretch-glyph is
+       instead of using that term without explanation.  Make the
+       cross-references more accurate.
+
        * display.texi (Usual Display): Update the description,
        cross-references, and indexing related to display of control
        characters and raw bytes.

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2011-11-26 13:51:58 +0000
+++ b/doc/lispref/display.texi  2011-11-26 14:07:22 +0000
@@ -193,10 +193,12 @@
 @defvar wrap-prefix
 If this buffer-local variable is address@hidden, it defines a
 ``prefix'' that is prepended to every continuation line at
-display-time.  (If lines are truncated, the wrap-prefix is never
-used.)  It may be a string, an image, or a stretch-glyph; the value is
-interpreted in the same way as a @code{display} text property.
address@hidden Property}.
+display time.  (If lines are truncated, the wrap-prefix is never
+used.)  It may be a string or an image (@pxref{Other Display Specs}),
+or a stretch of whitespace such as specified by the @code{:width} or
address@hidden:align-to} display properties (@pxref{Specified Space}).  The
+value is interpreted in the same way as a @code{display} text
+property.  @xref{Display Property}.
 
 A wrap-prefix may also be specified for regions of text, using the
 @code{wrap-prefix} text or overlay property.  This takes precedence
@@ -206,9 +208,11 @@
 @defvar line-prefix
 If this buffer-local variable is address@hidden, it defines a
 ``prefix'' that is prepended to every non-continuation line at
-display-time.  It may be a string, an image, or a stretch-glyph; the
-value is interpreted in the same way as a @code{display} text
-property.  @xref{Display Property}.
+display time.  It may be a string or an image (@pxref{Other Display
+Specs}), or a stretch of whitespace such as specified by the
address@hidden:width} or @code{:align-to} display properties (@pxref{Specified
+Space}).  The value is interpreted in the same way as a @code{display}
+text property.  @xref{Display Property}.
 
 A line-prefix may also be specified for regions of text using the
 @code{line-prefix} text or overlay property.  This takes precedence

=== modified file 'doc/lispref/text.texi'
--- a/doc/lispref/text.texi     2011-11-25 07:14:48 +0000
+++ b/doc/lispref/text.texi     2011-11-26 14:07:22 +0000
@@ -3191,10 +3191,12 @@
 
 @item wrap-prefix
 If text has a @code{wrap-prefix} property, the prefix it defines will
-be added at display-time to the beginning of every continuation line
+be added at display time to the beginning of every continuation line
 due to text wrapping (so if lines are truncated, the wrap-prefix is
-never used).  It may be a string, an image, or a stretch-glyph such as
-used by the @code{display} text-property.  @xref{Display Property}.
+never used).  It may be a string or an image (@pxref{Other Display
+Specs}), or a stretch of whitespace such as specified by the
address@hidden:width} or @code{:align-to} display properties (@pxref{Specified
+Space}).
 
 A wrap-prefix may also be specified for an entire buffer using the
 @code{wrap-prefix} buffer-local variable (however, a
@@ -3203,9 +3205,11 @@
 
 @item line-prefix
 If text has a @code{line-prefix} property, the prefix it defines will
-be added at display-time to the beginning of every non-continuation
-line.  It may be a string, an image, or a stretch-glyph such as used
-by the @code{display} text-property.  @xref{Display Property}.
+be added at display time to the beginning of every non-continuation
+line.  It may be a string or an image (@pxref{Other Display
+Specs}), or a stretch of whitespace such as specified by the
address@hidden:width} or @code{:align-to} display properties (@pxref{Specified
+Space}).
 
 A line-prefix may also be specified for an entire buffer using the
 @code{line-prefix} buffer-local variable (however, a