*** empty log message ***

diff --git a/lispref/display.texi b/lispref/display.texi
index 3eb2ced209b9bfc7f4d841a0921133e2e415ddf5..005ac907e0ea1a8307c368f9d05ceededfc2d361 100644 (file)
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -2717,6 +2717,7 @@ This function clears the image cache.  If @var{frame} is non-@code{nil},
 only the cache for that frame is cleared.  Otherwise all frames' caches
 are cleared.
 @end defun
+
 @node Blinking
 @section Blinking Parentheses
 @cindex parenthesis matching

diff --git a/lispref/frames.texi b/lispref/frames.texi
index 6552ac7f332e4952e142e575e49f0a7fe21dbe43..a54bccf37e0587596876c5e50290551be61f8395 100644 (file)
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -67,7 +67,7 @@ The frame is displayed on an MS-DOS terminal.
 * Color Names::                        Getting the definitions of color names.
 * Text Terminal Colors::        Defining colors for text-only terminals.
 * Resources::                  Getting resource values from the server.
-* Server Data::                        Getting info about the X server.
+* Display Feature Testing::     Determining the features of a terminal.
 @end menu
 
   @xref{Display}, for information about the related topic of 
@@ -1587,16 +1587,50 @@ variable to some other string, around a call to @code{x-get-resource}.
 
   @xref{Resources X,, X Resources, emacs, The GNU Emacs Manual}.
 
-@node Server Data
-@section Data about the X Server
+@node Display Feature Testing
+@section Display Feature Testing
+@cindex display feature testing
 
-  This section describes functions you can use to get information about
-the capabilities and origin of an X display that Emacs is using.  Each
-of these functions lets you specify the display you are interested in:
-the @var{display} argument can be either a display name, or a frame
-(meaning use the display that frame is on).  If you omit the
-@var{display} argument, or specify @code{nil}, that means to use the
-selected frame's display.
+  The functions in this section describe the basic capabilities of a
+particular display.  Lisp programs can use them to adapt their behavior
+to what the display can do.  For example, a program that ordinarly uses
+a popup menu could use the minibuffer if popup menus are not supported.
+
+  The optional argument @var{display} in these functions specifies which
+display to ask the question about.  It can be a display name, a frame
+(which designates the display that frame is on), or @code{nil} (which
+refers to the selected frame's display).
+
+  @xref{Color Names}, @ref{Text Terminal Colors}, for other functions to
+obtain information about displays.
+
+@defun display-popup-menus-p &optional display
+@tindex display-popup-menus-p
+This function returns @code{t} if popup menus are supported on
+@var{display}, @code{nil} if not.  Support for popup menus requires that
+the mouse be available, since the user cannot choose menu items without
+a mouse.
+@end defun
+
+@defun display-graphic-p &optional display
+@tindex display-graphic-p
+@cindex frames, more than one on display
+@cindex fonts, more than one on display
+This function returns @code{t} if @var{display} is a graphic display
+capable of displaying several frames and several different fonts at
+once.  This is true for displays that use a window system such as X, and
+false for text-only terminals.
+@end defun
+
+@defun display-selections-p &optional display
+@tindex display-selections-p
+This function returns @code{t} if @var{display} supports selections.
+Windowed displays normally support selections, but they may also be
+supported in some other cases.
+@end defun
+
+  These functions obtain additional information specifically
+about X displays.
 
 @defun x-display-screens &optional display
 This function returns the number of screens associated with the display.