diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-06-23 23:58:52 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-06-23 23:58:52 -0700 |
| commit | f99f7826a0303f7a40864571be7cbf84f3d4ee62 (patch) | |
| tree | a6e4ca5768d6053deb6ff992e2235be791d9fb59 /doc/lispref | |
| parent | 6c3e2c3de5ee118c8a8da180945ca63c059649e9 (diff) | |
| parent | 9dc3215fab2989509ce14e6eb7c1d616d2c7c5b3 (diff) | |
| download | emacs-f99f7826a0303f7a40864571be7cbf84f3d4ee62.tar.gz | |
Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/ChangeLog | 8 | ||||
| -rw-r--r-- | doc/lispref/functions.texi | 3 | ||||
| -rw-r--r-- | doc/lispref/loading.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/variables.texi | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index e95010a11a9..0b94ad66bf0 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,11 @@ +2013-06-24 Glenn Morris <rgm@gnu.org> + + * loading.texi (Autoload): Fix typo. + + * variables.texi (Lexical Binding): Fix typo. + + * functions.texi (Anonymous Functions): Put back ' removed 2012-10-23. + 2013-06-23 Lars Magne Ingebrigtsen <larsi@gnus.org> * display.texi (ImageMagick Images): Mention :max-width and diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 7768c147827..fcd345ef83b 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -974,10 +974,11 @@ Note that we do not quote the @code{lambda} form. compiled. This would not happen if, say, you had constructed the anonymous function by quoting it as a list: +@c Do not unquote this lambda! @example @group (defun double-property (symbol prop) - (change-property symbol prop (lambda (x) (* 2 x)))) + (change-property symbol prop '(lambda (x) (* 2 x)))) @end group @end example diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 4c0f0d73e41..dab8e8d1255 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -461,7 +461,7 @@ and calls @code{define-key}; not even if the variable name is the same symbol @var{function}. @cindex function cell in autoload -if @var{function} already has non-void function definition that is not +If @var{function} already has a non-void function definition that is not an autoload object, this function does nothing and returns @code{nil}. Otherwise, it constructs an autoload object (@pxref{Autoload Type}), and stores it as the function definition for @var{function}. The diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 4bcf7985f0c..4a38fa9ccd5 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -988,7 +988,7 @@ Here is an example: (setq my-ticker (lambda () (setq x (1+ x))))) @result{} (closure ((x . 0) t) () - (1+ x)) + (setq x (1+ x))) (funcall my-ticker) @result{} 1 |