diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-04-27 11:10:38 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-04-27 11:10:38 +0800 |
| commit | a8e7d6d783219972c08fd49a3a2afaf26eb139c2 (patch) | |
| tree | 5e86d23d9285389791dc8321d8a8a2ece2247bea /doc/lispref/intro.texi | |
| parent | b360839071ef6c7a9e917fe57a4aaeb39138e8c0 (diff) | |
| parent | c5bb756916baa63cc663d68d4c24e5ad33a764e8 (diff) | |
| download | emacs-a8e7d6d783219972c08fd49a3a2afaf26eb139c2.tar.gz | |
Merge changes from emacs-24 branch
Diffstat (limited to 'doc/lispref/intro.texi')
| -rw-r--r-- | doc/lispref/intro.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index d3a5b253162..37d2cc55a9e 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -146,7 +146,7 @@ printer'' refer to those routines in Lisp that convert textual representations of Lisp objects into actual Lisp objects, and vice versa. @xref{Printed Representation}, for more details. You, the person reading this manual, are thought of as ``the programmer'' and are -addressed as ``you.'' ``The user'' is the person who uses Lisp +addressed as ``you''. ``The user'' is the person who uses Lisp programs, including those you write. @cindex typographic conventions @@ -219,7 +219,7 @@ the examples in this manual, this is indicated with @samp{@result{}}: @end example @noindent -You can read this as ``@code{(car '(1 2))} evaluates to 1.'' +You can read this as ``@code{(car '(1 2))} evaluates to 1''. When a form is a macro call, it expands into a new form for Lisp to evaluate. We show the result of the expansion with |