Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-160
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-161
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-162
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-163
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-164
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-165
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-166
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-167
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-168
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-169
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-170
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-171
   Update from CVS: man/mh-e.texi (Folders): Various edits.

 * emacs@sv.gnu.org/emacs--devo--0--patch-172
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-58
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-59
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-60
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-61
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-62
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-63
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-64
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-534

5 files changed, 77 insertions, 33 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 9d07a2d59c8..8438af1698a 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,38 @@
+2006-03-21  Nick Roberts  <nickrob@snap.net.nz>
+
+        * display.texi (Fringe Indicators): Fix typos.
+
+2006-03-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * tips.texi (Documentation Tips): One can now also write `program'
+        in front of a quoted symbol in a docstring to prevent making a
+        hyperlink.
+
+2006-03-19  Alan Mackenzie  <acm@muc.de>
+
+        * text.texi (Special Properties): Clarify the definition of
+        'fontified.
+
+2006-03-16  Richard Stallman  <rms@gnu.org>
+
+        * display.texi (Defining Images): Minor cleanup.
+
+2006-03-16  Bill Wohler  <wohler@newt.com>
+
+        * display.texi (Defining Images): In image-load-path-for-library,
+        prefer user's images.
+
+2006-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * modes.texi (Region to Fontify): Remove font-lock-lines-before.
+
+2006-03-15  Bill Wohler  <wohler@newt.com>
+
+        * display.texi (Defining Images): Fix example in
+        image-load-path-for-library by not recommending that one binds
+        image-load-path. Just defvar it to placate compiler and only use
+        it if previously defined.
+
 2006-03-14  Bill Wohler  <wohler@newt.com>
 
         * display.texi (Defining Images): In image-load-path-for-library,
@@ -7,7 +42,7 @@
 
         * modes.texi: New node, "Region to Fontify" (for Font Lock).
         This describes font-lock-extend-region-function.
-        ("Other Font Lock Variables"): move "font-lock-lines-before" to
+        ("Other Font Lock Variables"): Move "font-lock-lines-before" to
         the new node "Region to Fontify".
 
 2006-03-13  Richard Stallman  <rms@gnu.org>
@@ -104,9 +139,9 @@
 
 2006-02-16  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
 
-        * display.texi (Other Display Specs, Image Descriptors): Revert
-        erroneous changes.  The previous description of image-descriptors
-        as `(image . PROPS)' was correct.
+        * display.texi (Other Display Specs, Image Descriptors):
+        Revert erroneous changes.  The previous description of
+        image-descriptors as `(image . PROPS)' was correct.
 
 2006-02-14  Richard M. Stallman  <rms@gnu.org>
 
@@ -157,8 +192,8 @@
 
 2006-01-29  Chong Yidong  <cyd@stupidchicken.com>
 
-        * display.texi (Other Display Specs, Image Descriptors): Image
-        description is a list, not a cons cell.
+        * display.texi (Other Display Specs, Image Descriptors):
+        Image description is a list, not a cons cell.
 
 2006-01-28  Luc Teirlinck  <teirllm@auburn.edu>
 
diff --git a/lispref/display.texi b/lispref/display.texi
index 294a6d64e7e..d9b5a9e5f0b 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -2876,12 +2876,12 @@ 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
 @code{t}, the corresponding value from the (non-local)
-@code{default-fringes-indicator-alist} is used.
+@code{default-fringe-indicator-alist} is used.
 
 To completely hide a specific indicator, set the bitmap to @code{nil}.
 @end defvar
 
-@defvar default-fringes-indicator-alist
+@defvar default-fringe-indicator-alist
 The value of this variable is the default value for
 @code{fringe-indicator-alist} in buffers that do not override it.
 @end defvar
@@ -2891,7 +2891,7 @@ The value of this variable is the default value for
 @code{left-arrow}, @code{right-arrow}, @code{up-arrow}, @code{down-arrow},
 @code{left-curly-arrow}, @code{right-curly-arrow},
 @code{left-triangle}, @code{right-triangle},
-@code{top-left-angle}, @code{ top-right-angle},
+@code{top-left-angle}, @code{top-right-angle},
 @code{bottom-left-angle}, @code{bottom-right-angle},
 @code{left-bracket}, @code{right-bracket},
 @code{filled-rectangle}, @code{hollow-rectangle},
@@ -4127,13 +4127,14 @@ should specify the image as follows:
 
 @defun image-load-path-for-library library image &optional path no-error
 @tindex image-load-path-for-library
-This function returns a suitable search path for images relative to
-@var{library}.
+This function returns a suitable search path for images used by the
+Lisp package @var{library}.
 
-First it searches for @var{image} in a path suitable for
-@var{library}, which includes @file{../../etc/images} and
-@file{../etc/images} relative to the library file itself, followed by
-@code{image-load-path} and @code{load-path}.
+It searches for @var{image} in @code{image-load-path} (excluding
+@file{@code{data-directory}/images}) and @code{load-path}, followed by
+a path suitable for @var{library}, which includes
+@file{../../etc/images} and @file{../etc/images} relative to the
+library file itself, and then in @file{@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
@@ -4148,11 +4149,13 @@ Here is an example that uses a common idiom to provide compatibility
 with versions of Emacs that lack the variable @code{image-load-path}:
 
 @example
-;; Avoid errors on Emacsen without `image-load-path'.
-(if (not (boundp 'image-load-path)) (defvar image-load-path nil))
+;; Shush compiler.
+(defvar image-load-path)
 
 (let* ((load-path (image-load-path-for-library "mh-e" "mh-logo.xpm"))
-       (image-load-path (cons (car load-path) image-load-path)))
+       (image-load-path (cons (car load-path)
+                              (when (boundp 'image-load-path)
+                                image-load-path))))
   (mh-tool-bar-folder-buttons-init))
 @end example
 @end defun
diff --git a/lispref/modes.texi b/lispref/modes.texi
index e15392ac85a..fc1953d24d9 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -2731,16 +2731,6 @@ on an earlier line.
 You can enlarge (or even reduce) the region to fontify by setting either
 of the following variables:
 
-@defvar font-lock-lines-before
-This variable specifies the number of extra lines to consider when
-refontifying the buffer after each text change.  Font lock begins
-refontifying from that number of lines before the changed region.  The
-default is 0, but using a larger value can be useful for coping with
-multi-line patterns.  This variable is ignored whenever
-@code{font-lock-extend-region-function} is set and returns a
-non-@code{nil} value.
-@end defvar
-
 @defvar font-lock-extend-region-function
 This buffer-local variable is either @code{nil} or is a function that
 determines the region to fontify, which Emacs then calls after each
diff --git a/lispref/text.texi b/lispref/text.texi
index c68a55bedc7..3a0d4f7a585 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -2994,9 +2994,25 @@ that all text between the character and where the mouse is have the same
 
 @item fontified
 @kindex fontified @r{(text property)}
-This property, if non-@code{nil}, says that text in the buffer has
-had faces assigned automatically by a feature such as Font-Lock mode.
-@xref{Auto Faces}.
+This property says whether the text has had faces assigned to it by
+font locking.  The display engine tests it to decide whether a buffer
+portion needs refontifying before display.  @xref{Auto Faces}.  It
+takes one of these three values---other values are invalid:
+
+@table @asis
+@item @code{nil}
+Font locking is disabled, or the @code{face} properties on the text,
+if any, are invalid.
+
+@item The symbol @code{defer}
+This value states that the text's @code{face} properties are invalid
+and marks it for deferred fontification.  It is used only when ``just
+in time'' font locking is enabled.
+
+@item @code{t}
+The @code{face} properties, or lack of them, on the text are currently
+valid.
+@end table
 
 @item display
 @kindex display @r{(text property)}
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 07689b4c9a4..8b033139275 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -741,8 +741,8 @@ then the hyperlink will refer only to the variable documentation of
 
 If a symbol has a function definition and/or a variable definition, but
 those are irrelevant to the use of the symbol that you are documenting,
-you can write the word @samp{symbol} before the symbol name to prevent
-making any hyperlink.  For example,
+you can write the words @samp{symbol} or @samp{program} before the
+symbol name to prevent making any hyperlink.  For example,
 
 @example
 If the argument KIND-OF-RESULT is the symbol `list',