# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1156857353 0
# Node ID 871eeda78fd765d844560ce64e1e79da7b63a738
# Parent  7011a586dd45dfb72d1b4df450d0e276f7c38409
	* display.texi (Images): Add xrref to display-images-p.

diff -r 7011a586dd45 -r 871eeda78fd7 lispref/ChangeLog
--- a/lispref/ChangeLog	Tue Aug 29 13:02:53 2006 +0000
+++ b/lispref/ChangeLog	Tue Aug 29 13:15:53 2006 +0000
@@ -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 -r 7011a586dd45 -r 871eeda78fd7 lispref/display.texi
--- a/lispref/display.texi	Tue Aug 29 13:02:53 2006 +0000
+++ b/lispref/display.texi	Tue Aug 29 13:15:53 2006 +0000
@@ -3564,6 +3564,13 @@
 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