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

[Karl Berry]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Karl Berry <karl>       06/07/05 14:13:25

Index: display.texi
===================================================================
RCS file: /sources/emacs/emacs/lispref/display.texi,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- display.texi        13 Jun 2006 22:18:06 -0000      1.223
+++ display.texi        5 Jul 2006 14:13:23 -0000       1.224
@@ -2889,20 +2889,19 @@
 @code{fringe-indicator-alist} in buffers that do not override it.
 @end 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{horizontal-bar},
address@hidden,
address@hidden
address@hidden table
+Standard fringe bitmaps for indicators:
address@hidden
+left-arrow right-arrow up-arrow down-arrow
+left-curly-arrow right-curly-arrow
+left-triangle right-triangle
+top-left-angle top-right-angle
+bottom-left-angle bottom-right-angle
+left-bracket right-bracket
+filled-rectangle hollow-rectangle
+filled-square hollow-square
+vertical-bar horizontal-bar
+empty-line question-mark
address@hidden example
 
 @node Fringe Cursors
 @subsection Fringe Cursors
@@ -2950,12 +2949,11 @@
 @code{fringe-cursor-alist} in buffers that do not override it.
 @end 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{horizontal-bar}.
address@hidden table
+Standard bitmaps for displaying the cursor in right fringe:
address@hidden
+filled-rectangle hollow-rectangle filled-square hollow-square
+vertical-bar horizontal-bar
address@hidden example
 
 
 @node Fringe Bitmaps
@@ -4117,11 +4115,12 @@
 This function returns a suitable search path for images used by the
 Lisp package @var{library}.
 
-It searches for @var{image} in @code{image-load-path} (excluding
address@hidden@code{data-directory}/images}) and @code{load-path}, followed by
-a path suitable for @var{library}, which includes
address@hidden/../etc/images} and @file{../etc/images} relative to the
-library file itself, and then in @address@hidden/images}.
+The function searches for @var{image} first in @code{image-load-path}
+(excluding @address@hidden/images}) and then in
address@hidden, followed by a path suitable for @var{library}, which
+includes @file{../../etc/images} and @file{../etc/images} relative to
+the library file itself, and finally in
address@hidden@code{data-directory}/images}.
 
 Then this function returns a list of directories which contains first
 the directory in which @var{image} was found, followed by the value of
@@ -4136,10 +4135,9 @@
 with versions of Emacs that lack the variable @code{image-load-path}:
 
 @example
-;; Shush compiler.
-(defvar image-load-path)
-
-(let* ((load-path (image-load-path-for-library "mh-e" "mh-logo.xpm"))
+(defvar image-load-path) ; shush compiler
+(let* ((load-path (image-load-path-for-library
+                        "mh-e" "mh-logo.xpm"))
        (image-load-path (cons (car load-path)
                               (when (boundp 'image-load-path)
                                 image-load-path))))
@@ -4913,7 +4911,7 @@
 and to ``finish'' the selection process, and a keymap to tie it all
 together conveniently.
 
address@hidden
address@hidden
 (defun colorcomp-mod (index limit delta)
   (let ((cur (aref colorcomp-data index)))
     (unless (= limit cur)
@@ -4951,7 +4949,7 @@
         (define-key m "." 'colorcomp-B-more)
         (define-key m " " 'colorcomp-copy-as-kill-and-exit)
         m))
address@hidden example
address@hidden smallexample
 
 Note that we never modify the data in each node, which is fixed when the
 ewoc is created to be either @code{nil} or an index into the vector