diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-08-11 17:09:11 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-08-11 17:09:11 -0700 |
| commit | 7a22490f14441898e1c4f6679f5924f097f3bb34 (patch) | |
| tree | 4f523fe5ece5911a4b30472071ec98bfe28c426a /doc/lispintro | |
| parent | 8496d8d7063d93031b65636e8be4c6f1b4208e74 (diff) | |
| parent | df0d73aa8da0a8cb6fd01e2f2604a6022e8f3d63 (diff) | |
| download | emacs-7a22490f14441898e1c4f6679f5924f097f3bb34.tar.gz | |
Merge from emacs-24; up to 2013-01-02T10:15:31Z!michael.albinus@gmx.de
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 932e54de553..db02a257a3a 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,5 +1,9 @@ 2013-08-12 Glenn Morris <rgm@gnu.org> + * emacs-lisp-intro.texi (Complete copy-region-as-kill): Fix typo. + + * emacs-lisp-intro.texi (Thank You): Avoid mailto: in html output. + * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME) (docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL) (INSTALL_DATA): New, set by configure. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 2160d7ba5a9..18ea8e87e19 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -954,7 +954,12 @@ encouragement. My mistakes are my own. @flushright Robert J. Chassell +@ifnothtml @email{bob@@gnu.org} +@end ifnothtml +@ifhtml +bob@@gnu.org +@end ifhtml @end flushright @c ================ Beginning of main text ================ @@ -8312,7 +8317,7 @@ As usual, this function can be divided into its component parts: The arguments are @code{beg} and @code{end} and the function is interactive with @code{"r"}, so the two arguments must refer to the -beginning and end of the region. If you have been reading though this +beginning and end of the region. If you have been reading through this document from the beginning, understanding these parts of a function is almost becoming routine. |