diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-02-10 10:58:48 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-02-10 10:58:48 -0800 |
| commit | 6e6c82a4e687708d5a7a3887f92db45bd74da276 (patch) | |
| tree | 85dc3105240e84a8cddadb25d572e170fcdbd8bc /doc/lispintro | |
| parent | 78df1fb1d46d556bfc2698ca1802972b13613ba8 (diff) | |
| parent | cc26d239af9a82cff079556a1daff4b4bf60eb5c (diff) | |
| download | emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.tar.gz | |
Merge from trunk.
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 14 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 9 |
2 files changed, 19 insertions, 4 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 0365a3ca174..bf08571f6fb 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,17 @@ +2012-01-28 Andreas Schwab <schwab@linux-m68k.org> + + * emacs-lisp-intro.texi (Top): Move setting of COUNT-WORDS outside + of @menu. (Bug#10628) + +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..a72fd253bc8 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -334,6 +334,9 @@ every node in every chapter. @c global@pageno = -11 @c end iftex +@set COUNT-WORDS count-words-example +@c Length of variable name chosen so that things still line up when expanded. + @menu * Preface:: What to look for. * List Processing:: What is Lisp? @@ -702,8 +705,6 @@ Regular Expression Searches * fwd-para while:: The forward motion @code{while} loop. Counting: Repetition and Regexps -@set COUNT-WORDS count-words-example -@c Length of variable name chosen so that things still line up when expanded. * Why Count Words:: * @value{COUNT-WORDS}:: Use a regexp, but find a problem. @@ -12607,7 +12608,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 +15013,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 |