Merge from emacs-24; up to 2012-12-20T16:09:05Z!dmantipov@yandex.ru

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d8a08ee5d3e..fe61fb4dce1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-19  Glenn Morris  <rgm@gnu.org>
+
+        * text.texi (Change Hooks): Fix typo.
+
 2013-02-15  Glenn Morris  <rgm@gnu.org>
 
         * modes.texi (Basic Major Modes): 'z' no longer bound in special-mode.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 00ec62ec49d..c6cbfa5b3f8 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4344,7 +4344,7 @@ This variable holds a list of functions to call after any buffer
 modification.  Each function receives three arguments: the beginning
 and end of the region just changed, and the length of the text that
 existed before the change.  All three arguments are integers.  The
-buffer has been changed is always the current buffer.
+buffer that has been changed is always the current buffer.
 
 The length of the old text is the difference between the buffer
 positions before and after that text as it was before the change.  As