* display.texi (Images): Add xrref to display-images-p.

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index b404e42081cf89f3afccadb86679305c9ad0d402..56604d27aa78f8673528ed6d1fe6efed1098f20c 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-29  Chong Yidong  <cyd@stupidchicken.com>
+
+       * display.texi (Images): Add xrref to display-images-p.
+
 2006-08-28  Kenichi Handa  <handa@m17n.org>
 
        * nonascii.texi (Lisp and Coding Systems): Fix description of

diff --git a/lispref/display.texi b/lispref/display.texi
index e762c14a7f0532f744fee1e0ac89fb888b173de3..5865f9c6854d311a041bee4e1a7df5a5913d7b31 100644 (file)
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3564,6 +3564,13 @@ If @var{window} is @code{nil}, the selected window is used.
 descriptor, then use it as a display specifier in the @code{display}
 property of text that is displayed (@pxref{Display Property}).
 
+  Emacs is usually able to display images when it is run on a
+graphical terminal.  Images cannot be displayed in a text terminal, on
+certain graphical terminals that lack the support for this, or if
+Emacs is compiled without image support.  You can use the function
+@code{display-images-p} to determine if images can in principle be
+displayed (@pxref{Display Feature Testing}).
+
   Emacs can display a number of different image formats; some of them
 are supported only if particular support libraries are installed on
 your machine.  In some environments, Emacs can load image