From 6a57fb5f2ba5f040a39fcf4d04ca37619aa754bd Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 14 Jul 2011 19:20:37 +0200 Subject: [PATCH] `put-image' doc fix * image.el (put-image): Mention the `put-image' overlay property (bug#7834). --- lisp/ChangeLog | 3 +++ lisp/image.el | 1 + 2 files changed, 4 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1469e13daa..67d1814b28 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-07-14 Lars Magne Ingebrigtsen + * 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 91c0f3c929..b67367ad43 100644 --- 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 -- 2.39.2