`put-image' doc fix

* image.el (put-image): Mention the `put-image' overlay property
(bug#7834).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1469e13daa80e68dc4df67f9b7f583d43ce36756..67d1814b28cd3efd47ac6c9d1be7909d950fe1ee 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * image.el (put-image): Mention the `put-image' overlay property
+       (bug#7834).
+
        * scroll-bar.el (set-scroll-bar-mode): Mention that
        `scroll-bar-mode' lists the values (bug#7772).
 

diff --git a/lisp/image.el b/lisp/image.el
index 91c0f3c92921b35eed30cec6439d6703880dc61e..b67367ad4362293141960c780050ff13c8c22f0c 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -389,6 +389,7 @@ IMAGE must be an image created with `create-image' or `defimage'.
 IMAGE is displayed by putting an overlay into the current buffer with a
 `before-string' STRING that has a `display' property whose value is the
 image.  STRING is defaulted if you omit it.
+The overlay created will have the `put-overlay' property set to t.
 POS may be an integer or marker.
 AREA is where to display the image.  AREA nil or omitted means
 display it in the text area, a value of `left-margin' means