diff options
| author | Glenn Morris | 2018-02-17 07:50:28 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-17 07:50:28 -0800 |
| commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
| tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /doc/lispintro | |
| parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
| parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
| download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.zip | |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 8b24cc1d8ba..137ccfe4a98 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi | |||
| @@ -11799,7 +11799,7 @@ Uses recursion." | |||
| 11799 | @end group | 11799 | @end group |
| 11800 | @end smallexample | 11800 | @end smallexample |
| 11801 | 11801 | ||
| 11802 | What happens when we call this function with a argument of 7? | 11802 | What happens when we call this function with an argument of 7? |
| 11803 | 11803 | ||
| 11804 | The first instance of the @code{triangle-recursively} function adds | 11804 | The first instance of the @code{triangle-recursively} function adds |
| 11805 | the number 7 to the value returned by a second instance of | 11805 | the number 7 to the value returned by a second instance of |
| @@ -20821,7 +20821,7 @@ The function @code{1+} which adds one to its argument, is executed on | |||
| 20821 | 20821 | ||
| 20822 | Contrast this with @code{apply}, which applies its first argument to | 20822 | Contrast this with @code{apply}, which applies its first argument to |
| 20823 | all the remaining. | 20823 | all the remaining. |
| 20824 | (@xref{Readying a Graph, , Readying a Graph}, for a explanation of | 20824 | (@xref{Readying a Graph, , Readying a Graph}, for an explanation of |
| 20825 | @code{apply}.) | 20825 | @code{apply}.) |
| 20826 | 20826 | ||
| 20827 | @need 1250 | 20827 | @need 1250 |