diff options
| author | Glenn Morris | 2012-11-17 17:43:32 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-11-17 17:43:32 -0800 |
| commit | 913c8291bdac169ca8cedb084c1381eafc892913 (patch) | |
| tree | 3819c90042e6dd013a950a6a6f3791fc497fd6bc | |
| parent | 7351b73d45a2f6f33230e6725fdfdf9e122eff14 (diff) | |
| download | emacs-913c8291bdac169ca8cedb084c1381eafc892913.tar.gz emacs-913c8291bdac169ca8cedb084c1381eafc892913.zip | |
* lisp/image.el (insert-image, insert-sliced-image): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/image.el | 6 |
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 @@ | |||
| 1 | 2012-11-18 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * image.el (insert-image, insert-sliced-image): Doc fix. | ||
| 4 | |||
| 1 | 2012-11-17 Chong Yidong <cyd@gnu.org> | 5 | 2012-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. |
| 433 | IMAGE is displayed by inserting STRING into the current buffer | 433 | IMAGE is displayed by inserting STRING into the current buffer |
| 434 | with a `display' property whose value is the image. STRING | 434 | with a `display' property whose value is the image. STRING |
| 435 | defaults to the empty string if you omit it. | 435 | defaults to a single space if you omit it. |
| 436 | AREA is where to display the image. AREA nil or omitted means | 436 | AREA is where to display the image. AREA nil or omitted means |
| 437 | display it in the text area, a value of `left-margin' means | 437 | display it in the text area, a value of `left-margin' means |
| 438 | display it in the left marginal area, a value of `right-margin' | 438 | display 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. |
| 472 | IMAGE is displayed by inserting STRING into the current buffer | 472 | IMAGE is displayed by inserting STRING into the current buffer |
| 473 | with a `display' property whose value is the image. STRING is | 473 | with a `display' property whose value is the image. The default |
| 474 | defaulted if you omit it. | 474 | STRING is a single space. |
| 475 | AREA is where to display the image. AREA nil or omitted means | 475 | AREA is where to display the image. AREA nil or omitted means |
| 476 | display it in the text area, a value of `left-margin' means | 476 | display it in the text area, a value of `left-margin' means |
| 477 | display it in the left marginal area, a value of `right-margin' | 477 | display it in the left marginal area, a value of `right-margin' |