aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-05-26 11:06:05 +0000
committerDave Love2000-05-26 11:06:05 +0000
commit4370a375b2f3dd2574c3c396cf9266dc706ff3a7 (patch)
treed6840c7f3c4cd87e1aab7841b30fd9e088f04327
parented62683d5a04cacdde4bc3aaefee533d1d6fdd42 (diff)
downloademacs-4370a375b2f3dd2574c3c396cf9266dc706ff3a7.tar.gz
emacs-4370a375b2f3dd2574c3c396cf9266dc706ff3a7.zip
(unload-feature): Fix interactive spec [from
lijnzaad@ebi.ac.uk].
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/loadhist.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 745729bdd8d..03ad3d30505 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12000-05-26 Dave Love <fx@gnu.org> 12000-05-26 Dave Love <fx@gnu.org>
2 2
3 * loadhist.el (unload-feature): Fix interactive spec [from
4 lijnzaad@ebi.ac.uk].
5
3 * emacs-lisp/bytecomp.el (byte-compile-callargs-warn): Use 6 * emacs-lisp/bytecomp.el (byte-compile-callargs-warn): Use
4 subr-arity to check primitives. 7 subr-arity to check primitives.
5 (byte-compile-flush-pending, byte-compile-file-form-progn) 8 (byte-compile-flush-pending, byte-compile-file-form-progn)
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index b6721caf074..beb4dd46e5c 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -116,9 +116,9 @@ pertinent symbols.")
116;;;###autoload 116;;;###autoload
117(defun unload-feature (feature &optional force) 117(defun unload-feature (feature &optional force)
118 "Unload the library that provided FEATURE, restoring all its autoloads. 118 "Unload the library that provided FEATURE, restoring all its autoloads.
119If the feature is required by any other loaded code, and optional FORCE 119If the feature is required by any other loaded code, and prefix arg FORCE
120is nil, raise an error." 120is nil, raise an error."
121 (interactive (list (read-feature "Feature: "))) 121 (interactive (list (read-feature "Feature: ") current-prefix-arg))
122 (if (not (featurep feature)) 122 (if (not (featurep feature))
123 (error "%s is not a currently loaded feature" (symbol-name feature))) 123 (error "%s is not a currently loaded feature" (symbol-name feature)))
124 (if (not force) 124 (if (not force)