aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-03 14:33:37 +0200
committerLars Magne Ingebrigtsen2011-07-03 14:33:37 +0200
commitc7844a276494777c90c57cfbb38d90f64ad2d866 (patch)
tree55742bab937351ec76a58f7a21379b2273291187
parent2e13213db29863814c5edac6d731731eda24e357 (diff)
downloademacs-c7844a276494777c90c57cfbb38d90f64ad2d866.tar.gz
emacs-c7844a276494777c90c57cfbb38d90f64ad2d866.zip
* functions.texi (What Is a Function): Document the autoload
object. Fixes: debbugs:6496
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/functions.texi7
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a87cd201676..f96ecc30c58 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * functions.texi (What Is a Function): Document the autoload
4 object (bug#6496).
5
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * customize.texi (Variable Definitions): Clarify that SETFUNCTION 8 * customize.texi (Variable Definitions): Clarify that SETFUNCTION
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 974487382c8..519957f8921 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -112,6 +112,13 @@ editors; for Lisp programs, the distinction is normally unimportant.
112@item byte-code function 112@item byte-code function
113A @dfn{byte-code function} is a function that has been compiled by the 113A @dfn{byte-code function} is a function that has been compiled by the
114byte compiler. @xref{Byte-Code Type}. 114byte compiler. @xref{Byte-Code Type}.
115
116@item autoload object
117@cindex autoload object
118An @dfn{autoload object} is a place-holder for a real function. If
119the autoload object is called, it will make Emacs load the file
120containing the definition of the real function, and then call the real
121function instead.
115@end table 122@end table
116 123
117@defun functionp object 124@defun functionp object