[Emacs-diffs] Changes to emacs/lispref/display.texi

[Eli Zaretskii]

Index: emacs/lispref/display.texi
diff -u emacs/lispref/display.texi:1.70 emacs/lispref/display.texi:1.71
--- emacs/lispref/display.texi:1.70     Mon Oct 29 19:28:01 2001
+++ emacs/lispref/display.texi  Wed Nov 14 14:31:18 2001
@@ -2817,15 +2817,19 @@
 supported.  Otherwise it returns an image descriptor.
 @end defun
 
address@hidden defimage variable doc &rest specs
address@hidden defimage symbol specs &optional doc
 @tindex defimage
-This macro defines @var{variable} as an image name.  The second argument,
address@hidden, is an optional documentation string.  The remaining
-arguments, @var{specs}, specify alternative ways to display the image.
+This macro defines @var{symbol} as an image name.  The arguments
address@hidden is a list which specifies how to display the image.
+The third argument, @var{doc}, is an optional documentation string.
 
 Each argument in @var{specs} has the form of a property list, and each
-one should specify at least the @code{:type} property and the
address@hidden:file} property.  Here is an example:
+one should specify at least the @code{:type} property and either the
address@hidden:file} or the @code{:data} property.  The value of @code{:type}
+should be a symbol specifying the image type, the value of
address@hidden:file} is the file to load the image from, and the value of
address@hidden:data} is a string containing the actual image data.  Here is an
+example:
 
 @example
 (defimage test-image
@@ -2836,9 +2840,9 @@
 @code{defimage} tests each argument, one by one, to see if it is
 usable---that is, if the type is supported and the file exists.  The
 first usable argument is used to make an image descriptor which is
-stored in the variable @var{variable}.
+stored in @var{symbol}.
 
-If none of the alternatives will work, then @var{variable} is defined
+If none of the alternatives will work, then @var{symbol} is defined
 as @code{nil}.
 @end defmac