summaryrefslogtreecommitdiff
path: root/doc/lispintro
diff options
context:
space:
mode:
authorXue Fuqiao <xfq.free@gmail.com>2013-04-24 06:26:40 +0800
committerXue Fuqiao <xfq.free@gmail.com>2013-04-24 06:26:40 +0800
commitedbf45693574f38188d102e9ff617e06c940fe20 (patch)
treef9876f30979759f10eb6c758e5fa14dbcd44bb12 /doc/lispintro
parentb46a056ef2486b9f5625972c03cfc02934a346c3 (diff)
downloademacs-edbf45693574f38188d102e9ff617e06c940fe20.tar.gz
Doc fix for emacs-lisp-intro.texi.
* doc/lispintro/emacs-lisp-intro.texi (Writing Defuns, Prevent confusion, Determining the Element, lambda): Refine the doc about Lisp macros, reported by Glenn Morris.
Diffstat (limited to 'doc/lispintro')
-rw-r--r--doc/lispintro/ChangeLog5
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi8
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index be9f9f963c0..a1ec47a7724 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,7 +1,8 @@
2013-04-23 Xue Fuqiao <xfq.free@gmail.com>
- * emacs-lisp-intro.texi (Complications, defvar): Refine the doc
- about Lisp macros. (http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00618.html)
+ * emacs-lisp-intro.texi (Complications, defvar, Writing Defuns)
+ (Prevent confusion, Determining the Element, lambda): Refine the
+ doc about Lisp macros, reported by Glenn Morris.
2013-04-21 Xue Fuqiao <xfq.free@gmail.com>
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 7831603124e..e0c51a9a8fb 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -3059,7 +3059,7 @@ symbol refers to it.)
@menu
* Primitive Functions::
-* defun:: The @code{defun} special form.
+* defun:: The @code{defun} macro.
* Install:: Install a function definition.
* Interactive:: Making a function interactive.
* Interactive Options:: Different options for @code{interactive}.
@@ -3700,7 +3700,7 @@ name for a @dfn{local variable} that overshadows any use of the same
name outside the @code{let} expression. This is like understanding
that whenever your host refers to `the house', he means his house, not
yours. (Symbols used in argument lists work the same way.
-@xref{defun, , The @code{defun} Special Form}.)
+@xref{defun, , The @code{defun} Macro}.)
Local variables created by a @code{let} expression retain their value
@emph{only} within the @code{let} expression itself (and within
@@ -19456,7 +19456,7 @@ them in an argument list (and within expressions called by them).
@ignore
@c texi2dvi fails when the name of the section is within ifnottex ...
(@xref{Prevent confusion, , @code{let} Prevents Confusion}, and
-@ref{defun, , The @code{defun} Special Form}.)
+@ref{defun, , The @code{defun} Macro}.)
@end ignore
@node yank
@@ -20976,7 +20976,7 @@ equivalent of @code{multiply-by-seven} is:
@end smallexample
@noindent
-(@xref{defun, , The @code{defun} Special Form}.)
+(@xref{defun, , The @code{defun} Macro}.)
@need 1250
@noindent