aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-11-17 17:43:32 -0800
committerGlenn Morris2012-11-17 17:43:32 -0800
commit913c8291bdac169ca8cedb084c1381eafc892913 (patch)
tree3819c90042e6dd013a950a6a6f3791fc497fd6bc
parent7351b73d45a2f6f33230e6725fdfdf9e122eff14 (diff)
downloademacs-913c8291bdac169ca8cedb084c1381eafc892913.tar.gz
emacs-913c8291bdac169ca8cedb084c1381eafc892913.zip
* lisp/image.el (insert-image, insert-sliced-image): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/image.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04eec6feab3..00cf0c1afb6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-11-18 Glenn Morris <rgm@gnu.org>
2
3 * image.el (insert-image, insert-sliced-image): Doc fix.
4
12012-11-17 Chong Yidong <cyd@gnu.org> 52012-11-17 Chong Yidong <cyd@gnu.org>
2 6
3 * emacs-lisp/syntax.el (syntax-propertize-function): Doc fix 7 * emacs-lisp/syntax.el (syntax-propertize-function): Doc fix
diff --git a/lisp/image.el b/lisp/image.el
index aef44fc3701..a8577ad5a7f 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -432,7 +432,7 @@ means display it in the right marginal area."
432 "Insert IMAGE into current buffer at point. 432 "Insert IMAGE into current buffer at point.
433IMAGE is displayed by inserting STRING into the current buffer 433IMAGE is displayed by inserting STRING into the current buffer
434with a `display' property whose value is the image. STRING 434with a `display' property whose value is the image. STRING
435defaults to the empty string if you omit it. 435defaults to a single space if you omit it.
436AREA is where to display the image. AREA nil or omitted means 436AREA is where to display the image. AREA nil or omitted means
437display it in the text area, a value of `left-margin' means 437display it in the text area, a value of `left-margin' means
438display it in the left marginal area, a value of `right-margin' 438display it in the left marginal area, a value of `right-margin'
@@ -470,8 +470,8 @@ height of the image; integer values are taken as pixel values."
470(defun insert-sliced-image (image &optional string area rows cols) 470(defun insert-sliced-image (image &optional string area rows cols)
471 "Insert IMAGE into current buffer at point. 471 "Insert IMAGE into current buffer at point.
472IMAGE is displayed by inserting STRING into the current buffer 472IMAGE is displayed by inserting STRING into the current buffer
473with a `display' property whose value is the image. STRING is 473with a `display' property whose value is the image. The default
474defaulted if you omit it. 474STRING is a single space.
475AREA is where to display the image. AREA nil or omitted means 475AREA is where to display the image. AREA nil or omitted means
476display it in the text area, a value of `left-margin' means 476display it in the text area, a value of `left-margin' means
477display it in the left marginal area, a value of `right-margin' 477display it in the left marginal area, a value of `right-margin'