Merge from emacs-23; up to 2010-06-10T12:56:[email protected].

6 files changed, 21 insertions, 9 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7ef3be46b6..3a66cebce2 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-12  Stefan Monnier  <[email protected]>
+
+	* modes.texi (Region to Refontify): Rename from "Region to Fontify".
+	(Multiline Font Lock):
+	* vol2.texi (Top):
+	* vol1.texi (Top):
+	* elisp.texi (Top): Update menu accordingly.
+
+2011-05-12  Drew Adams  <[email protected]>
+
+	* modes.texi (Region to Fontify): Fix typo.
+
 2011-05-06  Paul Eggert  <[email protected]>
 
 	* numbers.texi (Integer Basics): Large integers are treated as floats.
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 69c50ba42b..259bb3cf86 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -828,7 +828,7 @@ Font Lock Mode
 Multiline Font Lock Constructs
 
 * Font Lock Multiline::     Marking multiline chunks with a text property.
-* Region to Fontify::       Controlling which region gets refontified
+* Region to Refontify::     Controlling which region gets refontified
                               after a buffer change.
 
 Documentation
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index e3bdebd28a..72f39f681a 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -251,7 +251,7 @@ literally, i.e. without conversions of any kind.  The command
 @code{find-file-literally} sets this variable's local value, but other
 equivalent functions and commands can do that as well, e.g.@: to avoid
 automatic addition of a newline at the end of the file.  This variable
-us permanent local, so it is unaffected by changes of major modes.
+is permanent local, so it is unaffected by changes of major modes.
 @end defvar
 
 @node Subroutines of Visiting
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index f0a8985fa7..02f89f9320 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3174,7 +3174,7 @@ subsequent lines.
 
 @menu
 * Font Lock Multiline::         Marking multiline chunks with a text property.
-* Region to Fontify::           Controlling which region gets refontified
+* Region to Refontify::         Controlling which region gets refontified
                                   after a buffer change.
 @end menu
 
@@ -3226,7 +3226,7 @@ place the @code{font-lock-multiline} property on the text before
 Font-Lock looks at it, or use
 @code{font-lock-fontify-region-function}.
 
-@node Region to Fontify
+@node Region to Refontify
 @subsubsection Region to Fontify after a Buffer Change
 
   When a buffer is changed, the region that Font Lock refontifies is
@@ -3235,15 +3235,15 @@ While this works well most of the time, sometimes it doesn't---for
 example, when a change alters the syntactic meaning of text on an
 earlier line.
 
-  You can enlarge (or even reduce) the region to fontify by setting
-one the following variables:
+  You can enlarge (or even reduce) the region to refontify by setting
+the following variable:
 
 @defvar font-lock-extend-after-change-region-function
 This buffer-local variable is either @code{nil} or a function for
 Font-Lock to call to determine the region to scan and fontify.
 
 The function is given three parameters, the standard @var{beg},
-@var{end}, and @var{old-len} from after-change-functions
+@var{end}, and @var{old-len} from @code{after-change-functions}
 (@pxref{Change Hooks}).  It should return either a cons of the
 beginning and end buffer positions (in that order) of the region to
 fontify, or @code{nil} (which means choose the region in the standard
diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi
index ad8ff0819c..afcd3d6cbd 100644
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -847,7 +847,7 @@ Font Lock Mode
 Multiline Font Lock Constructs
 
 * Font Lock Multiline::     Marking multiline chunks with a text property.
-* Region to Fontify::       Controlling which region gets refontified
+* Region to Refontify::     Controlling which region gets refontified
                               after a buffer change.
 
 Documentation
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 7832b3a861..65ffbc2386 100644
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -846,7 +846,7 @@ Font Lock Mode
 Multiline Font Lock Constructs
 
 * Font Lock Multiline::     Marking multiline chunks with a text property.
-* Region to Fontify::       Controlling which region gets refontified
+* Region to Refontify::     Controlling which region gets refontified
                               after a buffer change.
 
 Documentation