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

[Richard M . Stallman]

Index: emacs/lispref/display.texi
diff -c emacs/lispref/display.texi:1.154 emacs/lispref/display.texi:1.155
*** emacs/lispref/display.texi:1.154    Wed Mar 23 22:47:41 2005
--- emacs/lispref/display.texi  Sat Mar 26 02:03:49 2005
***************
*** 1695,1704 ****
  
  @item fringe
  @kindex fringe @r{(face name)}
! This face controls the default colors of window fringes, the thin areas on
! either side that are used to display continuation and truncation glyphs.
! Other faces used to display bitmaps in the fringe implicitly inherits from
! this face.
  
  @item minibuffer-prompt
  @kindex minibuffer-prompt @r{(face name)}
--- 1695,1704 ----
  
  @item fringe
  @kindex fringe @r{(face name)}
! This face controls the default colors of window fringes, the thin
! areas on either side that are used to display continuation and
! truncation glyphs.  Other faces used to display bitmaps in the fringe
! are implicitly merged with this face.
  
  @item minibuffer-prompt
  @kindex minibuffer-prompt @r{(face name)}
***************
*** 2008,2013 ****
--- 2008,2015 ----
  The name of a face from which to inherit attributes, or a list of face
  names.  Attributes from inherited faces are merged into the face like an
  underlying face would be, with higher priority than underlying faces.
+ If a list of faces is used, attributes from faces earlier in the list
+ override those from later faces.
  
  @item :box
  Whether or not a box should be drawn around characters, its color, the
***************
*** 2833,2844 ****
  of the characters that appears in it.  Use a display specification of
  the form @code{(left-fringe @var{bitmap} address@hidden)} or
  @code{(right-fringe @var{bitmap} address@hidden)} (@pxref{Display
! Property}).  Here, @var{bitmap} is a symbol identifying the bitmap
! you want, and @var{face} (which is optional) is the name of the face
! whose colors should be used for displaying the bitmap, instead of the
! default @code{fringe} face.  When specified, @var{face} implicitly
! inherits from the @code{fringe} face, so normally @var{face} only
! specifies the foreground color for the bitmap.
  
    These are the symbols identify the standard fringe bitmaps.
  Evaluate @code{(require 'fringe)} to define them.  Fringe bitmap
--- 2835,2846 ----
  of the characters that appears in it.  Use a display specification of
  the form @code{(left-fringe @var{bitmap} address@hidden)} or
  @code{(right-fringe @var{bitmap} address@hidden)} (@pxref{Display
! Property}).  Here, @var{bitmap} is a symbol identifying the bitmap you
! want, and @var{face} (which is optional) is the name of the face whose
! colors should be used for displaying the bitmap, instead of the
! default @code{fringe} face.  @var{face} is automatically merged with
! the @code{fringe} face, so normally @var{face} need only specify the
! foreground color for the bitmap.
  
    These are the symbols identify the standard fringe bitmaps.
  Evaluate @code{(require 'fringe)} to define them.  Fringe bitmap
***************
*** 2928,2935 ****
  If @var{face} is @code{nil}, it selects the @code{fringe} face.  The
  bitmap's face controls the color to draw it in.
  
! The @var{face} implicitly inherits from the @code{fringe} face,
! so normally @var{face} should specifu only the foreground color.
  @end defun
  
  @node Overlay Arrow
--- 2930,2937 ----
  If @var{face} is @code{nil}, it selects the @code{fringe} face.  The
  bitmap's face controls the color to draw it in.
  
! @var{face} is merged with the @code{fringe} face, so normally
! @var{face} should specify only the foreground color.
  @end defun
  
  @node Overlay Arrow
***************
*** 2991,3001 ****
  @section Scroll Bars
  
  Normally the frame parameter @code{vertical-scroll-bars} controls
! whether the windows in the frame have vertical scroll bars.  A
! address@hidden parameter value means they do.  The frame parameter
  @code{scroll-bar-width} specifies how wide they are (@code{nil}
  meaning the default).  @xref{Window Frame Parameters}.
  
  @vindex vertical-scroll-bar
    You can enable or disable scroll bars for a particular buffer,
  by setting the variable @code{vertical-scroll-bar}.  This variable
--- 2993,3013 ----
  @section Scroll Bars
  
  Normally the frame parameter @code{vertical-scroll-bars} controls
! whether the windows in the frame have vertical scroll bars, and
! whether they are on the left or right.  The frame parameter
  @code{scroll-bar-width} specifies how wide they are (@code{nil}
  meaning the default).  @xref{Window Frame Parameters}.
  
+ @defun frame-current-scroll-bars &optional frame
+ This function reports the scroll bar type settings for frame
+ @var{frame}.  The value is a cons cell
+ @code{(@var{vertical-type} .@: @var{horizontal-type})}, where
+ @var{vertical-type} is either @code{left}, @code{right}, or @code{nil}
+ (which means no scroll bar.)  @var{horizontal-type} is meant to
+ specify the horizontal scroll bar type, but since they are not
+ implemented, it is always @code{nil}.
+ @end defun
+ 
  @vindex vertical-scroll-bar
    You can enable or disable scroll bars for a particular buffer,
  by setting the variable @code{vertical-scroll-bar}.  This variable
***************
*** 3050,3055 ****
--- 3062,3077 ----
  the left, and @code{right} to put a scroll bar on the right.
  @end defvar
  
+ @defun window-current-scroll-bars &optional window
+ This function reports the scroll bar type for window @var{window}.
+ If @var{window} is omitted or @code{nil}, the selected window is used.
+ The value is a cons cell
+ @code{(@var{vertical-type} .@: @var{horizontal-type})}.  Unlike
+ @code{window-scroll-bars}, this reports the scroll bar type actually
+ used, once frame defaults and @code{scroll-bar-mode} are taken into
+ account.
+ @end defun
+ 
  @defvar scroll-bar-width
  This variable, always local in all buffers, specifies the width of the
  buffer's scroll bars, measured in pixels.  A value of @code{nil} means