mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 14:30:50 -08:00
Code Issues Projects Releases Wiki Activity

unload-feature: Correct doc string to match info manual and reality

Browse source 
'unload-feature' doesn't try to "undo any additions the library has
made" to hooks, it tries to remove functions defined by the library
from hooks, no matter how they got there.

* lisp/loadhist.el (unload-feature): Correct the doc string.
* doc/lispref/loading.texi (Unloading): Clarify, fix typo.
This commit is contained in:
Štěpán Němec 2020-04-06 17:05:33 +02:00
parent 5c266a71c1
commit 8dc8ab6b42
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/lispref/loading.texi
View file

@ -1063,7 +1063,7 @@ It then restores any autoloads formerly associated with those symbols.
(Loading saves these in the @code{autoload} property of the symbol.) (Loading saves these in the @code{autoload} property of the symbol.)
Before restoring the previous definitions, @code{unload-feature} runs Before restoring the previous definitions, @code{unload-feature} runs
@code{remove-hook} to remove functions in the library from certain @code{remove-hook} to remove functions defined by the library from certain
hooks. These hooks include variables whose names end in @samp{-hook} hooks. These hooks include variables whose names end in @samp{-hook}
(or the deprecated suffix @samp{-hooks}), plus those listed in (or the deprecated suffix @samp{-hooks}), plus those listed in
@code{unload-feature-special-hooks}, as well as @code{unload-feature-special-hooks}, as well as
@ -1071,7 +1071,7 @@ hooks. These hooks include variables whose names end in @samp{-hook}
function because important hooks refer to functions that are no longer function because important hooks refer to functions that are no longer
defined. defined.
Standard unloading activities also undoes ELP profiling of functions Standard unloading activities also undo ELP profiling of functions
in that library, unprovides any features provided by the library, and in that library, unprovides any features provided by the library, and
cancels timers held in variables defined by the library. cancels timers held in variables defined by the library.

9
lisp/loadhist.el
View file

@ -234,11 +234,10 @@ If the feature is required by any other loaded code, and prefix arg FORCE
is nil, raise an error. is nil, raise an error.
Standard unloading activities include restoring old autoloads for Standard unloading activities include restoring old autoloads for
functions defined by the library, undoing any additions that the functions defined by the library, removing such functions from
library has made to hook variables or to `auto-mode-alist', undoing hooks and `auto-mode-alist', undoing their ELP profiling,
ELP profiling of functions in that library, unproviding any features unproviding any features provided by the library, and canceling
provided by the library, and canceling timers held in variables timers held in variables defined by the library.
defined by the library.
If a function `FEATURE-unload-function' is defined, this function If a function `FEATURE-unload-function' is defined, this function
calls it with no arguments, before doing anything else. That function calls it with no arguments, before doing anything else. That function