diff options
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 4 | ||||
| -rw-r--r-- | doc/lispintro/makefile.w32-in | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index bdcd9e9aea8..6cede6375f2 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-11-24 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in: Update dependencies. | ||
| 4 | |||
| 1 | 2011-11-16 Juanma Barranquero <lekktu@gmail.com> | 5 | 2011-11-16 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * emacs-lisp-intro.texi (etags): Fix typo. | 7 | * emacs-lisp-intro.texi (etags): Fix typo. |
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 244d95d6937..23d0d5a8f34 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi | |||
| @@ -1401,7 +1401,7 @@ This is a harmless activity; and indeed, we will often try to generate | |||
| 1401 | error messages intentionally. Once you understand the jargon, error | 1401 | error messages intentionally. Once you understand the jargon, error |
| 1402 | messages can be informative. Instead of being called ``error'' | 1402 | messages can be informative. Instead of being called ``error'' |
| 1403 | messages, they should be called ``help'' messages. They are like | 1403 | messages, they should be called ``help'' messages. They are like |
| 1404 | signposts to a traveller in a strange country; deciphering them can be | 1404 | signposts to a traveler in a strange country; deciphering them can be |
| 1405 | hard, but once understood, they can point the way. | 1405 | hard, but once understood, they can point the way. |
| 1406 | 1406 | ||
| 1407 | The error message is generated by a built-in GNU Emacs debugger. We | 1407 | The error message is generated by a built-in GNU Emacs debugger. We |
| @@ -2040,7 +2040,7 @@ the first argument. This function takes three arguments. Its first | |||
| 2040 | argument is the string of characters, the second and third arguments are | 2040 | argument is the string of characters, the second and third arguments are |
| 2041 | numbers that indicate the beginning and end of the substring. The | 2041 | numbers that indicate the beginning and end of the substring. The |
| 2042 | numbers are a count of the number of characters (including spaces and | 2042 | numbers are a count of the number of characters (including spaces and |
| 2043 | punctuations) from the beginning of the string. | 2043 | punctuation) from the beginning of the string. |
| 2044 | 2044 | ||
| 2045 | @need 800 | 2045 | @need 800 |
| 2046 | For example, if you evaluate the following: | 2046 | For example, if you evaluate the following: |
diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in index 7294d46b693..06641cc2222 100644 --- a/doc/lispintro/makefile.w32-in +++ b/doc/lispintro/makefile.w32-in | |||
| @@ -24,7 +24,7 @@ infodir = $(srcdir)/../../info | |||
| 24 | # Directory with the (customized) texinfo.tex file. | 24 | # Directory with the (customized) texinfo.tex file. |
| 25 | texinfodir = $(srcdir)/../misc | 25 | texinfodir = $(srcdir)/../misc |
| 26 | 26 | ||
| 27 | INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi | 27 | INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi $(srcdir)/doclicense.texi |
| 28 | # The file name eintr must fit within 5 characters, to allow for | 28 | # The file name eintr must fit within 5 characters, to allow for |
| 29 | # -NN extensions to fit into DOS 8+3 limits without clashing | 29 | # -NN extensions to fit into DOS 8+3 limits without clashing |
| 30 | INFO_TARGETS = $(infodir)/eintr | 30 | INFO_TARGETS = $(infodir)/eintr |