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

[Kim F. Storm]

Index: emacs/lispref/display.texi
diff -u emacs/lispref/display.texi:1.201 emacs/lispref/display.texi:1.202
--- emacs/lispref/display.texi:1.201    Fri Feb 17 03:44:38 2006
+++ emacs/lispref/display.texi  Mon Feb 20 22:15:13 2006
@@ -2722,7 +2722,9 @@
 
 @menu
 * Fringe Size/Pos::     Specifying where to put the window fringes.
-* Fringe Bitmaps::      Displaying bitmaps in the window fringes.
+* Fringe Indicators::   Displaying indicator icons in the window fringes.
+* Fringe Cursors::      Displaying cursors in the right fringe.
+* Fringe Bitmaps::      Specifying bitmaps for fringe indicators.
 * Customizing Bitmaps:: Specifying your own bitmaps to use in the fringes.
 * Overlay Arrow::       Display of an arrow to indicate position.
 @end menu
@@ -2774,6 +2776,151 @@
 @var{right-width} @var{outside-margins})}.
 @end defun
 
+
address@hidden Fringe Indicators
address@hidden Fringe Indicators
address@hidden fringe indicators
address@hidden indicators, fringe
+
+  The @dfn{fringe indicators} are tiny icons Emacs displays in the
+window fringe (on a graphic display) to indicate truncated or
+continued lines, buffer boundaries, overlay arrow, etc.
+
address@hidden indicate-empty-lines
address@hidden indicate-empty-lines
address@hidden fringes, and empty line indication
+When this is address@hidden, Emacs displays a special glyph in the
+fringe of each empty line at the end of the buffer, on graphical
+displays.  @xref{Fringes}.  This variable is automatically
+buffer-local in every buffer.
address@hidden defopt
+
address@hidden indicate-buffer-boundaries
+This buffer-local variable controls how the buffer boundaries and
+window scrolling are indicated in the window fringes.
+
+Emacs can indicate the buffer boundaries---that is, the first and last
+line in the buffer---with angle icons when they appear on the screen.
+In addition, Emacs can display an up-arrow in the fringe to show
+that there is text above the screen, and a down-arrow to show
+there is text below the screen.
+
+There are four kinds of basic values:
+
address@hidden @asis
address@hidden @code{nil}
+Don't display the icons.
address@hidden @code{left}
+Display them in the left fringe.
address@hidden @code{right}
+Display them in the right fringe.
address@hidden @var{anything-else}
+Display the icon at the top of the window top in the left fringe, and other
+in the right fringe.
address@hidden table
+
+If value is a cons @code{(@var{angles} . @var{arrows})}, @var{angles}
+controls the angle icons, and @var{arrows} controls the arrows.  Both
address@hidden and @var{arrows} work according to the table above.
+Thus, @code{(t .  right)} places the top angle icon in the left
+fringe, the bottom angle icon in the right fringe, and both arrows in
+the right fringe.
address@hidden defvar
+
address@hidden default-indicate-buffer-boundaries
+The value of this variable is the default value for
address@hidden in buffers that do not override it.
address@hidden defvar
+
address@hidden fringe-indicator-alist
+This buffer-local variable specifies the mapping from logical fringe
+indicators to the actual bitmaps displayed in the window fringes.
+
+These symbols identify the logical fringe indicators:
+
address@hidden @asis
address@hidden Truncation and continuation line indicators:
address@hidden, @code{continuation}.
+
address@hidden Buffer position indicators:
address@hidden, @code{down},
address@hidden, @code{bottom},
address@hidden
+
address@hidden Empty line indicator:
address@hidden
+
address@hidden Overlay arrow indicator:
address@hidden
+
address@hidden Unknown bitmap indicator:
address@hidden
address@hidden table
+
+  The value is an alist where each element @code{(@var{indicator} . 
@var{bitmaps})}
+specifies the fringe bitmaps used to display a specific logical
+fringe indicator.
+
+Here, @var{indicator} specifies the logical indicator type, and
address@hidden is list of symbols @code{(@var{left} @var{right}
address@hidden @var{right1}])} which specifies the actual bitmap shown
+in the left or right fringe for the logical indicator.
+
+The @var{left} and @var{right} symbols specify the bitmaps shown in
+the left and/or right fringe for the specific indicator.  The
address@hidden or @var{right1} bitmaps are used only for the `bottom' and
+`top-bottom indicators when the last (only) line in has no final
+newline.  Alternatively, @var{bitmaps} may be a single symbol which is
+used in both left and right fringes.
+
+When @code{fringe-indicator-alist} has a buffer-local value, and there
+is no bitmap defined for a logical indicator, or the bitmap is
address@hidden, the corresponding value from the (non-local)
address@hidden is used.
+
+To completely hide a specific indicator, set the bitmap to @code{nil}.
address@hidden defvar
+
address@hidden default-fringes-indicator-alist
+The value of this variable is the default value for
address@hidden in buffers that do not override it.
address@hidden defvar
+
address@hidden @asis
address@hidden Standard fringe bitmaps for indicators:
address@hidden, @code{right-arrow}, @code{up-arrow}, @code{down-arrow},
address@hidden, @code{right-curly-arrow},
address@hidden, @code{right-triangle},
address@hidden, @code{ top-right-angle},
address@hidden, @code{bottom-right-angle},
address@hidden, @code{right-bracket},
address@hidden, @code{hollow-rectangle},
address@hidden, @code{hollow-square},
address@hidden, @code{horisontal-bar},
address@hidden,
address@hidden
address@hidden table
+
address@hidden Fringe Cursors
address@hidden Fringe Cursors
address@hidden fringe cursors
address@hidden cursor, fringe
+
+  When a line is exactly as wide as the window, Emacs displays the
+cursor in the right fringe instead of using two lines.  Different
+bitmaps are used to represent the cursor in the fringe depending on
+the current buffer's cursor type.
+
address@hidden @asis
address@hidden Logical cursor types:
address@hidden , @code{hollow}, @code{bar},
address@hidden, @code{hollow-small}.
address@hidden table
+
+The @code{hollow-small} type is used instead of @code{hollow} when the
+normal @code{hollow-rectangle} bitmap is too tall to fit on a specific
+display line.
+
 @defvar overflow-newline-into-fringe
 If this is address@hidden, lines exactly as wide as the window (not
 counting the final newline character) are not continued.  Instead,
@@ -2781,16 +2928,44 @@
 fringe.
 @end defvar
 
address@hidden fringe-cursor-alist
+This variable specifies the mapping from logical cursor type to the
+actual fringe bitmaps displayed in the right fringe.  The value is an
+alist where each element @code{(@var{cursor}. @var{bitmap})} specifies
+the fringe bitmaps used to display a specific logical cursor type in
+the fringe.  Here, @var{cursor} specifies the logical cursor type and
address@hidden is a symbol specifying the fringe bitmap to be displayed
+for that logical cursor type.
+
+When @code{fringe-cursor-alist} has a buffer-local value, and there is
+no bitmap defined for a cursor type, the corresponding value from the
+(non-local) @code{default-fringes-indicator-alist} is used.
address@hidden defvar
+
address@hidden default-fringes-cursor-alist
+The value of this variable is the default value for
address@hidden in buffers that do not override it.
address@hidden defvar
+
address@hidden @asis
address@hidden Standard bitmaps for displaying the cursor in right fringe:
address@hidden, @code{hollow-rectangle},
address@hidden, @code{hollow-square},
address@hidden, @code{horisontal-bar}.
address@hidden table
+
+
 @node Fringe Bitmaps
 @subsection Fringe Bitmaps
 @cindex fringe bitmaps
 @cindex bitmaps, fringe
 
-  The @dfn{fringe bitmaps} are tiny icons Emacs displays in the window
-fringe (on a graphic display) to indicate truncated or continued
-lines, buffer boundaries, overlay arrow, etc.  The fringe bitmaps are
-shared by all frames and windows.  You can redefine the built-in
-fringe bitmaps, and you can define new fringe bitmaps.
+  The @dfn{fringe bitmaps} are the actual bitmaps which represent the
+logical fringe indicators for truncated or continued lines, buffer
+boundaries, overlay arrow, etc.  Fringe bitmap symbols have their own
+name space.  The fringe bitmaps are shared by all frames and windows.
+You can redefine the built-in fringe bitmaps, and you can define new
+fringe bitmaps.
 
   The way to display a bitmap in the left or right fringes for a given
 line in a window is by specifying the @code{display} property for one
@@ -2804,32 +2979,6 @@
 the @code{fringe} face, so normally @var{face} need only specify the
 foreground color for the bitmap.
 
-  These symbols identify the standard fringe bitmaps.  Evaluate
address@hidden(require 'fringe)} to define them.  Fringe bitmap symbols have
-their own name space.
-
address@hidden @asis
address@hidden Truncation and continuation line bitmaps:
address@hidden, @code{right-truncation},
address@hidden, @code{continuation-line}.
-
address@hidden Buffer indication bitmaps:
address@hidden, @code{down-arrow},
address@hidden, @code{top-right-angle},
address@hidden, @code{bottom-right-angle},
address@hidden, @code{right-bracket}.
-
address@hidden Empty line indication bitmap:
address@hidden
-
address@hidden Overlay arrow bitmap:
address@hidden
-
address@hidden Bitmaps for displaying the cursor in right fringe:
address@hidden, @code{hollow-box-cursor}, @code{hollow-square},
address@hidden, @code{hbar-cursor}.
address@hidden table
-
 @defun fringe-bitmaps-at-pos &optional pos window
 This function returns the fringe bitmaps of the display line
 containing position @var{pos} in window @var{window}.  The return
@@ -4598,52 +4747,6 @@
 command @code{tab-to-tab-stop}.  @xref{Indent Tabs}.
 @end defopt
 
address@hidden indicate-empty-lines
address@hidden indicate-empty-lines
address@hidden fringes, and empty line indication
-When this is address@hidden, Emacs displays a special glyph in the
-fringe of each empty line at the end of the buffer, on graphical
-displays.  @xref{Fringes}.  This variable is automatically
-buffer-local in every buffer.
address@hidden defopt
-
address@hidden indicate-buffer-boundaries
-This buffer-local variable controls how the buffer boundaries and
-window scrolling are indicated in the window fringes.
-
-Emacs can indicate the buffer boundaries---that is, the first and last
-line in the buffer---with angle icons when they appear on the screen.
-In addition, Emacs can display an up-arrow in the fringe to show
-that there is text above the screen, and a down-arrow to show
-there is text below the screen.
-
-There are four kinds of basic values:
-
address@hidden @asis
address@hidden @code{nil}
-Don't display the icons.
address@hidden @code{left}
-Display them in the left fringe.
address@hidden @code{right}
-Display them in the right fringe.
address@hidden @var{anything-else}
-Display the icon at the top of the window top in the left fringe, and other
-in the right fringe.
address@hidden table
-
-If value is a cons @code{(@var{angles} . @var{arrows})}, @var{angles}
-controls the angle icons, and @var{arrows} controls the arrows.  Both
address@hidden and @var{arrows} work according to the table above.
-Thus, @code{(t .  right)} places the top angle icon in the left
-fringe, the bottom angle icon in the right fringe, and both arrows in
-the right fringe.
address@hidden defvar
-
address@hidden default-indicate-buffer-boundaries
-The value of this variable is the default value for
address@hidden in buffers that do not override it.
address@hidden defvar
-
 @node Display Tables
 @section Display Tables