diff options
| author | Xue Fuqiao | 2013-10-28 06:53:48 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-10-28 06:53:48 +0800 |
| commit | 18c9f8a224e17082270b83fb77a1fc9d41072cff (patch) | |
| tree | 126d3c04f98c720b577fce6f5a27e969b9aa5d18 | |
| parent | b1e8e010610ae57027c84f2f7c2966baf8ef274d (diff) | |
| download | emacs-18c9f8a224e17082270b83fb77a1fc9d41072cff.tar.gz emacs-18c9f8a224e17082270b83fb77a1fc9d41072cff.zip | |
* lisp/image.el (defimage): Doc fix.
| -rw-r--r-- | doc/lispref/display.texi | 1 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/image.el | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index ac39a8b4eb4..cdec1953999 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -4781,6 +4781,7 @@ from the file's name. | |||
| 4781 | The remaining arguments, @var{props}, specify additional image | 4781 | The remaining arguments, @var{props}, specify additional image |
| 4782 | properties---for example, | 4782 | properties---for example, |
| 4783 | 4783 | ||
| 4784 | @c ‘:heuristic-mask’ is not documented? | ||
| 4784 | @example | 4785 | @example |
| 4785 | (create-image "foo.xpm" 'xpm nil :heuristic-mask t) | 4786 | (create-image "foo.xpm" 'xpm nil :heuristic-mask t) |
| 4786 | @end example | 4787 | @end example |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b9541322ac0..74e3450dc02 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-10-27 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * image.el (defimage): Doc fix. | ||
| 4 | |||
| 1 | 2013-10-27 Alan Mackenzie <acm@muc.de> | 5 | 2013-10-27 Alan Mackenzie <acm@muc.de> |
| 2 | 6 | ||
| 3 | Indent statements in macros following "##" correctly. | 7 | Indent statements in macros following "##" correctly. |
diff --git a/lisp/image.el b/lisp/image.el index 91cc3addb06..0fc4deba296 100644 --- a/lisp/image.el +++ b/lisp/image.el | |||
| @@ -591,7 +591,7 @@ Image files should not be larger than specified by `max-image-size'." | |||
| 591 | 591 | ||
| 592 | ;;;###autoload | 592 | ;;;###autoload |
| 593 | (defmacro defimage (symbol specs &optional doc) | 593 | (defmacro defimage (symbol specs &optional doc) |
| 594 | "Define SYMBOL as an image. | 594 | "Define SYMBOL as an image, and return SYMBOL. |
| 595 | 595 | ||
| 596 | SPECS is a list of image specifications. DOC is an optional | 596 | SPECS is a list of image specifications. DOC is an optional |
| 597 | documentation string. | 597 | documentation string. |