aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-10-14 20:23:53 +0300
committerEli Zaretskii2019-10-14 20:23:53 +0300
commitad30f1e5fc955d95ebc09016f3b95afc6f594010 (patch)
tree68acd0c9b5507db985cb193e4763add917bbfb13
parent83010ae0fedf150e590eb38eadab0110946d8206 (diff)
downloademacs-ad30f1e5fc955d95ebc09016f3b95afc6f594010.tar.gz
emacs-ad30f1e5fc955d95ebc09016f3b95afc6f594010.zip
Minor fixes in Introduction to Emacs Lisp
* doc/lispintro/emacs-lisp-intro.texi (if, save-excursion): 'defun' is a macro, not a special form anymore. (Bug#37747)
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi15
1 files changed, 7 insertions, 8 deletions
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 3e43f7f09f4..489ba8d6ef8 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -3826,12 +3826,11 @@ delimit them from the body of the @code{let}.
3826@findex if 3826@findex if
3827@cindex Conditional with @code{if} 3827@cindex Conditional with @code{if}
3828 3828
3829A third special form, in addition to @code{defun} and @code{let}, is the 3829Anoter special form is the conditional @code{if}. This form is used
3830conditional @code{if}. This form is used to instruct the computer to 3830to instruct the computer to make decisions. You can write function
3831make decisions. You can write function definitions without using 3831definitions without using @code{if}, but it is used often enough, and
3832@code{if}, but it is used often enough, and is important enough, to be 3832is important enough, to be included here. It is used, for example, in
3833included here. It is used, for example, in the code for the 3833the code for the function @code{beginning-of-buffer}.
3834function @code{beginning-of-buffer}.
3835 3834
3836The basic idea behind an @code{if}, is that @emph{if} a test is true, 3835The basic idea behind an @code{if}, is that @emph{if} a test is true,
3837@emph{then} an expression is evaluated. If the test is not true, the 3836@emph{then} an expression is evaluated. If the test is not true, the
@@ -4204,8 +4203,8 @@ On the other hand, this function returns @code{nil} if the test is false.
4204@findex point 4203@findex point
4205@findex mark 4204@findex mark
4206 4205
4207The @code{save-excursion} function is the third and final special form 4206The @code{save-excursion} function is the final special form that we
4208that we will discuss in this chapter. 4207will discuss in this chapter.
4209 4208
4210In Emacs Lisp programs used for editing, the @code{save-excursion} 4209In Emacs Lisp programs used for editing, the @code{save-excursion}
4211function is very common. It saves the location of point, 4210function is very common. It saves the location of point,