Merge from trunk.

[gnu-emacs] / doc / lispref / functions.texi

diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 974487382c8604622fd9439eb5786a62c80f658d..f3b2375b61da57d6db9954fb355aa0b8edb7d231 100644 (file)
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -112,6 +112,13 @@ editors; for Lisp programs, the distinction is normally unimportant.
 @item byte-code function
 A @dfn{byte-code function} is a function that has been compiled by the
 byte compiler.  @xref{Byte-Code Type}.
+
+@item autoload object
+@cindex autoload object
+An @dfn{autoload object} is a place-holder for a real function.  If
+the autoload object is called, it will make Emacs load the file
+containing the definition of the real function, and then call the real
+function instead.
 @end table
 
 @defun functionp object
@@ -783,6 +790,12 @@ This function returns @var{arg} and has no side effects.
 This function ignores any arguments and returns @code{nil}.
 @end defun
 
+  Emacs Lisp functions can also be user-visible @dfn{commands}.  A
+command is a function that has an @dfn{interactive} specification.
+You may want to call these functions as if they were called
+interactively.  See @ref{Interactive Call} for details on how to do
+that.
+
 @node Mapping Functions
 @section Mapping Functions
 @cindex mapping functions