aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispintro
diff options
context:
space:
mode:
Diffstat (limited to 'doc/lispintro')
-rw-r--r--doc/lispintro/ChangeLog9
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi4
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 @@
12012-01-19 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs-lisp-intro.texi (count-words-in-defun):
4 Add missing parenthesis (bug#10544).
5
62012-01-17 Glenn Morris <rgm@gnu.org>
7
8 * emacs-lisp-intro.texi (re-search-forward): Fix typo.
9
12011-11-24 Juanma Barranquero <lekktu@gmail.com> 102011-11-24 Juanma Barranquero <lekktu@gmail.com>
2 11
3 * makefile.w32-in: Update dependencies. 12 * 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:
12607@enumerate 12607@enumerate
12608@item 12608@item
12609The first argument is the regular expression that the function searches 12609The first argument is the regular expression that the function searches
12610for. The regular expression will be a string between quotations marks. 12610for. The regular expression will be a string between quotation marks.
12611 12611
12612@item 12612@item
12613The optional second argument limits how far the function will search; it is a 12613The 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:
15012@group 15012@group
15013(while (and (< (point) end) 15013(while (and (< (point) end)
15014 (re-search-forward 15014 (re-search-forward
15015 "\\(\\w\\|\\s_\\)+[^ \t\n]*[ \t\n]*" end t) 15015 "\\(\\w\\|\\s_\\)+[^ \t\n]*[ \t\n]*" end t))
15016 (setq count (1+ count))) 15016 (setq count (1+ count)))
15017@end group 15017@end group
15018@end smallexample 15018@end smallexample