diff options
| author | Richard M. Stallman | 2012-07-05 21:47:46 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-05 21:47:46 -0400 |
| commit | 8bee192afde0b1c972ce6f81b56e6206e89bc49e (patch) | |
| tree | 96a4dbb91092703f51f73a7171a4debcfe7d8bdd | |
| parent | 60198fc97941a550ad74b3c9c4065d7902116cd8 (diff) | |
| download | emacs-8bee192afde0b1c972ce6f81b56e6206e89bc49e.tar.gz emacs-8bee192afde0b1c972ce6f81b56e6206e89bc49e.zip | |
* doc/lispref/intro.texi: Improve/undo previous changes.
| -rw-r--r-- | doc/lispref/intro.texi | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 6dc5991f23d..0e8e0e5a8eb 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi | |||
| @@ -235,7 +235,7 @@ evaluation of the expanded form. | |||
| 235 | @result{} c | 235 | @result{} c |
| 236 | @end example | 236 | @end example |
| 237 | 237 | ||
| 238 | Sometimes to help describe one form, we show another form that | 238 | To help describe one form, we sometimes show another form that |
| 239 | produces identical results. The exact equivalence of two forms is | 239 | produces identical results. The exact equivalence of two forms is |
| 240 | indicated with @samp{@equiv{}}. | 240 | indicated with @samp{@equiv{}}. |
| 241 | 241 | ||
| @@ -350,7 +350,7 @@ arguments default to @code{nil}). Do not write @code{&optional} when | |||
| 350 | you call the function. | 350 | you call the function. |
| 351 | 351 | ||
| 352 | The keyword @code{&rest} (which must be followed by a single | 352 | The keyword @code{&rest} (which must be followed by a single |
| 353 | argument name) indicates that any number of arguments may follow. The | 353 | argument name) indicates that any number of arguments can follow. The |
| 354 | single argument name following @code{&rest} receives, as its | 354 | single argument name following @code{&rest} receives, as its |
| 355 | value, a list of all the remaining arguments passed to the function. | 355 | value, a list of all the remaining arguments passed to the function. |
| 356 | Do not write @code{&rest} when you call the function. | 356 | Do not write @code{&rest} when you call the function. |
| @@ -380,10 +380,9 @@ More generally, | |||
| 380 | @end defun | 380 | @end defun |
| 381 | 381 | ||
| 382 | Any argument whose name contains the name of a type (e.g., | 382 | Any argument whose name contains the name of a type (e.g., |
| 383 | @var{integer}, @var{integer1} or @var{buffer}) is expected to be bound | 383 | @var{integer}, @var{integer1} or @var{buffer}) is expected to be of that |
| 384 | to an object of that type. A plural of a type (such as @var{buffers}) | 384 | type. A plural of a type (such as @var{buffers}) often means a list of |
| 385 | often means a list of objects of that type. An argument named with the | 385 | objects of that type. An argument named @var{object} may be of any type. |
| 386 | type @var{object} may be bound to an object of any type. | ||
| 387 | (For a list of Emacs object types, @pxref{Lisp Data Types}.) An argument | 386 | (For a list of Emacs object types, @pxref{Lisp Data Types}.) An argument |
| 388 | with some other sort of name (e.g., @var{new-file}) is discussed | 387 | with some other sort of name (e.g., @var{new-file}) is discussed |
| 389 | specifically in the description of the function. In some sections, | 388 | specifically in the description of the function. In some sections, |