aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/image.el1
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1469e13daa8..67d1814b28c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * image.el (put-image): Mention the `put-image' overlay property
4 (bug#7834).
5
3 * scroll-bar.el (set-scroll-bar-mode): Mention that 6 * scroll-bar.el (set-scroll-bar-mode): Mention that
4 `scroll-bar-mode' lists the values (bug#7772). 7 `scroll-bar-mode' lists the values (bug#7772).
5 8
diff --git a/lisp/image.el b/lisp/image.el
index 91c0f3c9292..b67367ad436 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -389,6 +389,7 @@ IMAGE must be an image created with `create-image' or `defimage'.
389IMAGE is displayed by putting an overlay into the current buffer with a 389IMAGE is displayed by putting an overlay into the current buffer with a
390`before-string' STRING that has a `display' property whose value is the 390`before-string' STRING that has a `display' property whose value is the
391image. STRING is defaulted if you omit it. 391image. STRING is defaulted if you omit it.
392The overlay created will have the `put-overlay' property set to t.
392POS may be an integer or marker. 393POS may be an integer or marker.
393AREA is where to display the image. AREA nil or omitted means 394AREA is where to display the image. AREA nil or omitted means
394display it in the text area, a value of `left-margin' means 395display it in the text area, a value of `left-margin' means