[Emacs-diffs] /srv/bzr/emacs/trunk r105207: `put-image' doc fix

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105207
fixes bug(s): http://debbugs.gnu.org/7834
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-14 19:20:37 +0200
message:
  `put-image' doc fix
  
  * image.el (put-image): Mention the `put-image' overlay property
  (bug#7834).
modified:
  lisp/ChangeLog
  lisp/image.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-14 17:11:49 +0000
+++ b/lisp/ChangeLog    2011-07-14 17:20:37 +0000
@@ -1,5 +1,8 @@
 2011-07-14  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2011-06-11 23:03:16 +0000
+++ b/lisp/image.el     2011-07-14 17:20:37 +0000
@@ -389,6 +389,7 @@
 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