[Emacs-diffs] Changes to emacs/doc/lispref/loading.texi,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/10/27 09:07:17

Index: doc/lispref/loading.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/loading.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/lispref/loading.texi    6 Sep 2007 04:27:41 -0000       1.2
+++ doc/lispref/loading.texi    27 Oct 2007 09:07:15 -0000      1.3
@@ -862,24 +862,27 @@
 It then restores any autoloads formerly associated with those symbols.
 (Loading saves these in the @code{autoload} property of the symbol.)
 
address@hidden unload-feature-special-hooks
 Before restoring the previous definitions, @code{unload-feature} runs
 @code{remove-hook} to remove functions in the library from certain
 hooks.  These hooks include variables whose names end in @samp{hook}
 or @samp{-hooks}, plus those listed in
address@hidden  This is to prevent Emacs from
-ceasing to function because important hooks refer to functions that
-are no longer defined.
address@hidden, as well as
address@hidden  This is to prevent Emacs from ceasing to
+function because important hooks refer to functions that are no longer
+defined.
+
+Standard unloading activities also undoes ELP profiling of functions
+in that library, unprovides any features provided by the library, and
+cancels timers held in variables defined by the library.
 
address@hidden @var{feature}-unload-hook
address@hidden @var{feature}-unload-function
 If these measures are not sufficient to prevent malfunction, a library
-can define an explicit unload hook.  If @address@hidden
-is defined, it is run as a normal hook before restoring the previous
-definitions, @emph{instead of} the usual hook-removing actions.  The
-unload hook ought to undo all the global state changes made by the
-library that might cease to work once the library is unloaded.
address@hidden can cause problems with libraries that fail to do
-this, so it should be used with caution.
+can define an explicit unloader named @address@hidden
+If that symbol is defined as a function, @code{unload-feature} calls
+it with no arguments before doing anything else.  It can do whatever
+is appropriate to unload the library.  If it returns @code{nil},
address@hidden proceeds to take the normal unload actions.
+Otherwise it considers the job to be done.
 
 Ordinarily, @code{unload-feature} refuses to unload a library on which
 other loaded libraries depend.  (A library @var{a} depends on library