X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8cb16ad11df1269550867b5f044a5037b0519234..4342e957a2521bbe9b574871e3bbd60d63c93461:/lisp/loadhist.el diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 80a59463d7..da6fd695da 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -1,6 +1,6 @@ ;;; loadhist.el --- lisp functions for working with feature groups -;; Copyright (C) 1995, 1998, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1998, 2000, 2005 Free Software Foundation, Inc. ;; Author: Eric S. Raymond ;; Maintainer: FSF @@ -51,9 +51,26 @@ a buffer with no associated file, or an `eval-region', return nil." (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)) @@ -63,7 +80,7 @@ a buffer with no associated file, or an `eval-region', return nil." (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)) @@ -116,6 +133,12 @@ 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. @@ -132,16 +155,16 @@ 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 (not force) - (let* ((file (feature-file feature)) - (dependents (delete file (copy-sequence (file-dependents file))))) - (if dependents - (error "Loaded libraries %s depend on %s" - (prin1-to-string dependents) file)))) + (unless (featurep feature) + (error "%s is not a currently loaded feature" (symbol-name feature))) + (unless force + (let* ((file (feature-file feature)) + (dependents (delete file (copy-sequence (file-dependents file))))) + (when dependents + (error "Loaded libraries %s depend on %s" + (prin1-to-string dependents) file)))) (let* ((unload-hook-features-list (feature-symbols feature)) - (file (car unload-hook-features-list)) + (file (pop unload-hook-features-list)) (unload-hook (intern-soft (concat (symbol-name feature) "-unload-hook")))) ;; Try to avoid losing badly when hooks installed in critical @@ -160,43 +183,48 @@ such as redefining an Emacs function." ;; normally works. (mapatoms (lambda (x) - (if (or (and (boundp x) ; Random hooks. - (consp (symbol-value x)) - (string-match "-hooks?\\'" (symbol-name x))) - (and (boundp x) ; Known abnormal hooks etc. - (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 unload-hook-features-list)) - (if (symbolp elt) - (elp-restore-function elt)))) - (mapc - (lambda (x) - (cond ((stringp x) nil) - ((consp x) - ;; Remove any feature names that this file provided. - (if (eq (car x) 'provide) - (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 (fboundp x) - (if (fboundp 'ad-unadvise) - (ad-unadvise x)) - (fmakunbound x) - (let ((aload (get x 'autoload))) - (if aload (fset x (cons 'autoload aload)))))))) - (cdr unload-hook-features-list)) + (when (and (boundp x) + (or (and (consp (symbol-value x)) ; Random hooks. + (string-match "-hooks?\\'" (symbol-name x))) + (memq x unload-feature-special-hooks))) ; Known abnormal hooks etc. + (dolist (y unload-hook-features-list) + (when (and (eq (car-safe y) 'defun) + (not (get (cdr y) 'autoload))) + (remove-hook x (cdr y))))))) + ;; Remove any feature-symbols from auto-mode-alist as well. + (dolist (y unload-hook-features-list) + (when (and (eq (car-safe y) 'defun) + (not (get (cdr y) 'autoload))) + (setq auto-mode-alist + (rassq-delete-all (cdr y) auto-mode-alist))))) + (when (fboundp 'elp-restore-function) ; remove ELP stuff first + (dolist (elt unload-hook-features-list) + (when (symbolp elt) + (elp-restore-function elt)))) + (dolist (x unload-hook-features-list) + (if (consp x) + (cond + ;; Remove any feature names that this file provided. + ((eq (car x) 'provide) + (setq features (delq (cdr x) features))) + ((eq (car x) 'defun) + (let ((fun (cdr x))) + (when (fboundp fun) + (when (fboundp 'ad-unadvise) + (ad-unadvise fun)) + (fmakunbound fun) + (let ((aload (get fun 'autoload))) + (when aload + (fset fun (cons 'autoload aload)))))))) + ;; Kill local values as much as possible. + (dolist (buf (buffer-list)) + (with-current-buffer buf + (kill-local-variable x))) + ;; Get rid of the default binding if we can. + (unless (local-variable-if-set-p x) + (makunbound x)))) ;; Delete the load-history element for this file. - (let ((elt (assoc file load-history))) - (setq load-history (delq elt load-history))))) + (setq load-history (delq (assoc file load-history) load-history)))) (provide 'loadhist)