[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8dc8ab6 3/3: unload-feature: Correct doc string to match info man
From: |
Št?pán N?mec |
Subject: |
master 8dc8ab6 3/3: unload-feature: Correct doc string to match info manual and reality |
Date: |
Wed, 21 Oct 2020 12:51:06 -0400 (EDT) |
branch: master
commit 8dc8ab6b42b021f9796e59cfdb758b48aaf55ffc
Author: Štěpán Němec <stepnem@gmail.com>
Commit: Štěpán Němec <stepnem@gmail.com>
unload-feature: Correct doc string to match info manual and reality
'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.
---
doc/lispref/loading.texi | 4 ++--
lisp/loadhist.el | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index aa6ef30..e536415 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -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.)
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}
(or the deprecated suffix @samp{-hooks}), plus those listed in
@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
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
cancels timers held in variables defined by the library.
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 8157667..8ac575e 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -234,11 +234,10 @@ If the feature is required by any other loaded code, and
prefix arg FORCE
is nil, raise an error.
Standard unloading activities include restoring old autoloads for
-functions defined by the library, undoing any additions that the
-library has made to hook variables or to `auto-mode-alist', undoing
-ELP profiling of functions in that library, unproviding any features
-provided by the library, and canceling timers held in variables
-defined by the library.
+functions defined by the library, removing such functions from
+hooks and `auto-mode-alist', undoing their ELP profiling,
+unproviding any features provided by the library, and canceling
+timers held in variables defined by the library.
If a function `FEATURE-unload-function' is defined, this function
calls it with no arguments, before doing anything else. That function