aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/image.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 814edf45491..f320398975c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-07-17 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * image.el (put-image): Doc typo fix.
4
3 * progmodes/etags.el (tags-search): Doc typo fix. 5 * progmodes/etags.el (tags-search): Doc typo fix.
4 6
5 * mail/smtpmail.el (smtpmail-via-smtp): Query the user for 7 * mail/smtpmail.el (smtpmail-via-smtp): Query the user for
diff --git a/lisp/image.el b/lisp/image.el
index b67367ad436..c6862622639 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -389,7 +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. 392The overlay created will have the `put-image' property set to t.
393POS may be an integer or marker. 393POS may be an integer or marker.
394AREA is where to display the image. AREA nil or omitted means 394AREA is where to display the image. AREA nil or omitted means
395display it in the text area, a value of `left-margin' means 395display it in the text area, a value of `left-margin' means