;;; Code:
(defun feature-symbols (feature)
- "Return the file and list of symbols associated with a given FEATURE."
+ "Return the file and list of definitions associated with FEATURE.
+The value is actually the element of `load-history'
+for the file that did (provide FEATURE)."
(catch 'foundit
(mapc (lambda (x)
(if (member (cons 'provide feature) (cdr x))
(error "%S is not a currently loaded feature" feature)
(car (feature-symbols feature))))
+(defun file-loadhist-lookup (file)
+ "Return the `load-history' element for FILE."
+ ;; First look for FILE as given.
+ (let ((symbols (assoc file load-history)))
+ ;; Try converting a library name to an absolute file name.
+ (and (null symbols)
+ (let ((absname (find-library-name file)))
+ (if (not (equal absname file))
+ (setq symbols (cdr (assoc absname load-history))))))
+ ;; Try converting an absolute file name to a library name.
+ (and (null symbols) (string-match "[.]el\\'" file)
+ (let ((libname (file-name-nondirectory file)))
+ (string-match "[.]el\\'" libname)
+ (setq libname (substring libname 0 (match-beginning 0)))
+ (setq symbols (cdr (assoc libname load-history)))))
+ symbols))
+
(defun file-provides (file)
"Return the list of features provided by FILE."
- (let ((symbols (cdr (assoc file load-history)))
+ (let ((symbols (file-loadhist-lookup file))
provides)
(mapc (lambda (x)
(if (and (consp x) (eq (car x) 'provide))
(defun file-requires (file)
"Return the list of features required by FILE."
- (let ((symbols (cdr (assoc file load-history)))
+ (let ((symbols (file-loadhist-lookup file))
requires)
(mapc (lambda (x)
(if (and (consp x) (eq (car x) 'require))
features)
nil t)))
-(defvar loadhist-hook-functions
+(defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks)
+(defvar unload-feature-special-hooks
'(after-change-functions
-after-insert-file-functions auto-fill-function
-before-change-functions blink-paren-function
-buffer-access-fontify-functions command-line-functions
-comment-indent-function kill-buffer-query-functions
-kill-emacs-query-functions lisp-indent-function
-mouse-position-function
-redisplay-end-trigger-functions temp-buffer-show-function
-window-scroll-functions window-size-change-functions
-write-region-annotate-functions)
+ after-insert-file-functions auto-fill-function
+ before-change-functions blink-paren-function
+ buffer-access-fontify-functions command-line-functions
+ comment-indent-function kill-buffer-query-functions
+ kill-emacs-query-functions lisp-indent-function
+ mouse-position-function
+ redisplay-end-trigger-functions temp-buffer-show-function
+ window-scroll-functions window-size-change-functions
+ write-region-annotate-functions)
"A list of special hooks from Info node `(elisp)Standard Hooks'.
These are symbols with hook-type values whose names don't end in
`-hook' or `-hooks', from which `unload-feature' tries to remove
pertinent symbols.")
+(defvar unload-hook-features-list nil
+ "List of features of the package being unloaded.
+
+This is meant to be used by FEATURE-unload-hook hooks, see the
+documentation of `unload-feature' for details.")
+
;;;###autoload
(defun unload-feature (feature &optional force)
"Unload the library that provided FEATURE, restoring all its autoloads.
If the feature is required by any other loaded code, and prefix arg FORCE
-is nil, raise an error."
+is nil, raise an error.
+
+This function tries to undo modifications made by the package to
+hooks. Packages may define a hook FEATURE-unload-hook that is called
+instead of the normal heuristics for doing this. Such a hook should
+undo all the relevant global state changes that may have been made by
+loading the package or executing functions in it. It has access to
+the package's feature list (before anything is unbound) in the
+variable `unload-hook-features-list' and could remove features from it
+in the event that the package has done something normally-ill-advised,
+such as redefining an Emacs function."
(interactive (list (read-feature "Feature: ") current-prefix-arg))
(if (not (featurep feature))
(error "%s is not a currently loaded feature" (symbol-name feature)))
(if dependents
(error "Loaded libraries %s depend on %s"
(prin1-to-string dependents) file))))
- (let* ((flist (feature-symbols feature))
- (file (car flist))
+ (let* ((unload-hook-features-list (feature-symbols feature))
+ (file (car unload-hook-features-list))
(unload-hook (intern-soft (concat (symbol-name feature)
"-unload-hook"))))
;; Try to avoid losing badly when hooks installed in critical
;; places go away. (Some packages install things on
;; `kill-buffer-hook', `activate-menubar-hook' and the like.)
- ;; First off, provide a clean way for package `foo' to arrange
- ;; this by defining `foo-unload-hook'.
+ ;; First off, provide a clean way for package FOO to arrange
+ ;; this by adding hooks on the variable `FOO-unload-hook'.
(if unload-hook
(run-hooks unload-hook)
;; Otherwise, do our best. Look through the obarray for symbols
(consp (symbol-value x))
(string-match "-hooks?\\'" (symbol-name x)))
(and (boundp x) ; Known abnormal hooks etc.
- (memq x loadhist-hook-functions)))
- (dolist (y (cdr flist))
+ (memq x unload-feature-special-hooks)))
+ (dolist (y (cdr unload-hook-features-list))
(remove-hook x y))))))
(if (fboundp 'elp-restore-function) ; remove ELP stuff first
- (dolist (elt (cdr flist))
+ (dolist (elt (cdr unload-hook-features-list))
(if (symbolp elt)
(elp-restore-function elt))))
(mapc
((consp x)
;; Remove any feature names that this file provided.
(if (eq (car x) 'provide)
- (setq features (delq (cdr x) features))))
+ (setq features (delq (cdr x) features)))
+ (when (eq (car x) 'defvar)
+ ;; Kill local values as much as possible.
+ (dolist (buf (buffer-list))
+ (with-current-buffer buf
+ (kill-local-variable (cdr x))))
+ ;; Get rid of the default binding if we can.
+ (unless (local-variable-if-set-p (cdr x))
+ (makunbound (cdr x)))))
(t
- (when (boundp x)
- (makunbound x))
(when (fboundp x)
(if (fboundp 'ad-unadvise)
(ad-unadvise x))
(fmakunbound x)
(let ((aload (get x 'autoload)))
(if aload (fset x (cons 'autoload aload))))))))
- (cdr flist))
+ (cdr unload-hook-features-list))
;; Delete the load-history element for this file.
(let ((elt (assoc file load-history)))
(setq load-history (delq elt load-history)))))
(provide 'loadhist)
+;;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798
;;; loadhist.el ends here