diff options
author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-17 17:57:47 +0200 |
---|---|---|
committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-17 17:57:47 +0200 |
commit | 12dc863d6230435ecf30283bd2926696c50f8d4f (patch) | |
tree | 1e5125ce1e76ead4a04a77c4c3a4f62ccb9ec881 | |
parent | 46cfea45c4ec986e4cd3e8c4e0a25054841735eb (diff) | |
download | emacs-12dc863d6230435ecf30283bd2926696c50f8d4f.tar.gz |
* image.el (put-image): Doc typo fix.
-rw-r--r-- | lisp/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/image.el | 2 |
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 @@ 2011-07-17 Lars Magne Ingebrigtsen <larsi@gnus.org> + * image.el (put-image): Doc typo fix. + * progmodes/etags.el (tags-search): Doc typo fix. * 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'. 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. +The overlay created will have the `put-image' 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 |