diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /doc/lispref/loading.texi | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'doc/lispref/loading.texi')
| -rw-r--r-- | doc/lispref/loading.texi | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 461 | symbol @var{function}. | 461 | symbol @var{function}. |
| 462 | 462 | ||
| 463 | @cindex function cell in autoload | 463 | @cindex function cell in autoload |
| 464 | if @var{function} already has non-void function definition that is not | 464 | If @var{function} already has a non-void function definition that is not |
| 465 | an autoload object, this function does nothing and returns @code{nil}. | 465 | an autoload object, this function does nothing and returns @code{nil}. |
| 466 | Otherwise, it constructs an autoload object (@pxref{Autoload Type}), | 466 | Otherwise, it constructs an autoload object (@pxref{Autoload Type}), |
| 467 | and stores it as the function definition for @var{function}. The | 467 | and stores it as the function definition for @var{function}. The |