upstream

2 files changed, 11 insertions, 2 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 0365a3ca174..2a1d018cc26 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp-intro.texi (count-words-in-defun):
+        Add missing parenthesis (bug#10544).
+
+2012-01-17  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (re-search-forward): Fix typo.
+
 2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in: Update dependencies.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 0f9b6b906aa..d70ff9f3b44 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -12607,7 +12607,7 @@ four arguments:
 @enumerate
 @item
 The first argument is the regular expression that the function searches
-for.  The regular expression will be a string between quotations marks.
+for.  The regular expression will be a string between quotation marks.
 
 @item
 The optional second argument limits how far the function will search; it is a
@@ -15012,7 +15012,7 @@ expression for this (@pxref{Syntax}), so the loop is straightforward:
 @group
 (while (and (< (point) end)
             (re-search-forward
-             "\\(\\w\\|\\s_\\)+[^ \t\n]*[ \t\n]*" end t)
+             "\\(\\w\\|\\s_\\)+[^ \t\n]*[ \t\n]*" end t))
   (setq count (1+ count)))
 @end group
 @end smallexample