Fix the use case of popping from display property.

 src/dispextern.h (struct iterator_stack_entry, struct it): New
 member from_disp_prop_p.
 src/xdisp.c (push_it, pop_it): Save and restore from_disp_prop_p.
 (handle_single_display_spec, push_display_prop): Set the
 from_disp_prop_p flag.
 (get_overlay_strings_1): Reset the from_disp_prop_p flag.
 (pop_it): Call iterate_out_of_display_property only if we are
 popping after iteration over a string that came from a display
 property.  Fix a typo in popping stretch info.  Add an assertion
 for verifying that the iterator position is in sync with the bidi
 iterator.
 (handle_single_display_spec, get_overlay_strings_1)
 (push_display_prop): Fix initialization of paragraph direction for
 string when that of the parent object is not yet determined.

2 files changed, 8 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7ef3be46b68..636054972af 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Other Display Specs): Document that `left-fringe'
+        and `right-fringe' display specifications are of the "replacing"
+        kind.
+
 2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * numbers.texi (Integer Basics): Large integers are treated as floats.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 80a035aa346..6c5c8caa233 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3893,7 +3893,8 @@ Margins}).
 @itemx (right-fringe @var{bitmap} @r{[}@var{face}@r{]})
 This display specification on any character of a line of text causes
 the specified @var{bitmap} be displayed in the left or right fringes
-for that line.  The optional @var{face} specifies the colors to be
+for that line, instead of the characters that have the display
+specification.  The optional @var{face} specifies the colors to be
 used for the bitmap.  @xref{Fringe Bitmaps}, for the details.
 
 @item (space-width @var{factor})