# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1263179018 28800
# Node ID 7038dde9ccd72e11cc9c28364cd8431fb5ea9466
# Parent  04c3b0f26a9e65a5d0388d5d41e1d0c3a1c1a5e5
(Highlight Interactively): `t' does not mean highlight all patterns.
(Bug#5335)

diff -r 04c3b0f26a9e -r 7038dde9ccd7 doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Sun Jan 10 22:30:40 2010 +0800
+++ b/doc/emacs/ChangeLog	Sun Jan 10 19:03:38 2010 -0800
@@ -1,3 +1,8 @@
+2010-01-11  Glenn Morris  <rgm@gnu.org>
+
+	* display.texi (Highlight Interactively): `t' does not mean highlight
+	all patterns.  (Bug#5335)
+
 2009-12-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* misc.texi (Shell): Document async-shell-command.
diff -r 04c3b0f26a9e -r 7038dde9ccd7 doc/emacs/display.texi
--- a/doc/emacs/display.texi	Sun Jan 10 22:30:40 2010 +0800
+++ b/doc/emacs/display.texi	Sun Jan 10 19:03:38 2010 -0800
@@ -1,6 +1,8 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+@c   Free Software Foundation, Inc.
+
 @c See file emacs.texi for copying conditions.
 @node Display, Search, Registers, Top
 @chapter Controlling the Display
@@ -775,15 +777,14 @@
 
 @vindex hi-lock-file-patterns-policy
 The variable @code{hi-lock-file-patterns-policy} controls whether Hi
-Lock mode should automatically extract and highlight patterns found in
-a file when it is visited.  Its value can be @code{nil} (never
-highlight), @code{t} (highlight the patterns), @code{ask} (query the
-user), or a function.  If it is a function,
-@code{hi-lock-find-patterns} calls it with the patterns as argument;
-if the function returns non-@code{nil}, the patterns are used.  The
-default is @code{nil}.  Note that patterns are always highlighted if
-you call @code{hi-lock-find-patterns} directly, regardless of the
-value of this variable.
+Lock mode should automatically extract and highlight patterns found in a
+file when it is visited.  Its value can be @code{nil} (never highlight),
+@code{ask} (query the user), or a function.  If it is a function,
+@code{hi-lock-find-patterns} calls it with the patterns as argument; if
+the function returns non-@code{nil}, the patterns are used.  The default
+is @code{ask}.  Note that patterns are always highlighted if you call
+@code{hi-lock-find-patterns} directly, regardless of the value of this
+variable.
 
 @vindex hi-lock-exclude-modes
 Also, @code{hi-lock-find-patterns} does nothing if the current major