diff options
| author | Joakim Verona | 2013-05-29 09:57:21 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-05-29 09:57:21 +0200 |
| commit | 4f0994366d33f8f76db4662cc126720866df3461 (patch) | |
| tree | bcd298449e72c3c5e103fa592a5c137a71664067 /doc | |
| parent | 4c71f9d37642209c3636b173b364ece36c38b57b (diff) | |
| parent | 03983bdcc404a0e813857be4f5abae4849b47d91 (diff) | |
| download | emacs-4f0994366d33f8f76db4662cc126720866df3461.tar.gz emacs-4f0994366d33f8f76db4662cc126720866df3461.zip | |
Merge remote-tracking branch 'origin/trunk' into xwidget
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/functions.texi | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 249a2f21ccb..8f675bfcda6 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-05-29 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * functions.texi (Lambda Expressions): Lambda expressions don't | ||
| 4 | evaluate to themselves in general (bug#11782). | ||
| 5 | |||
| 1 | 2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * loading.texi (Autoload): | 8 | * loading.texi (Autoload): |
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 999923f5b84..7768c147827 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi | |||
| @@ -196,9 +196,8 @@ an example: | |||
| 196 | @end example | 196 | @end example |
| 197 | 197 | ||
| 198 | @noindent | 198 | @noindent |
| 199 | In Emacs Lisp, such a list is valid as an expression---it evaluates to | 199 | In Emacs Lisp, such a list is a valid expression which evaluates to |
| 200 | itself. But its main use is not to be evaluated as an expression, but | 200 | a function object. |
| 201 | to be called as a function. | ||
| 202 | 201 | ||
| 203 | A lambda expression, by itself, has no name; it is an @dfn{anonymous | 202 | A lambda expression, by itself, has no name; it is an @dfn{anonymous |
| 204 | function}. Although lambda expressions can be used this way | 203 | function}. Although lambda expressions can be used this way |