2005-10-23 MIYOSHI Masanori <miyoshi@meadowy.org> (tiny change)

[gnu-emacs] / lisp / loadhist.el

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 1c71cc6cd07e201363ffd3f2da10461dc99bb314..f23715f38250220bcf921356fa9e6bc4ca9c7449 100644 (file)
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -1,6 +1,7 @@
 ;;; loadhist.el --- lisp functions for working with feature groups
 
-;; Copyright (C) 1995, 1998, 2000, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -52,24 +53,23 @@ a buffer with no associated file, or an `eval-region', return nil."
     (car (feature-symbols feature))))
 
 (defun file-loadhist-lookup (file)
-  "Return the `load-history' element for FILE."
+  "Return the `load-history' element for FILE.
+FILE can be a file name, or a library name.
+A library name is equivalent to the file name that `load-library' would load."
   ;; 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)))))
+        (let ((absname 
+               (locate-file file load-path load-suffixes)))
+          (and absname (not (equal absname file))
+               (setq symbols (cdr (assoc absname load-history))))))
     symbols))
 
 (defun file-provides (file)
-  "Return the list of features provided by FILE."
+  "Return the list of features provided by FILE as it was loaded.
+FILE can be a file name, or a library name.
+A library name is equivalent to the file name that `load-library' would load."
   (let ((symbols (file-loadhist-lookup file))
        provides)
     (mapc (lambda (x)
@@ -79,7 +79,9 @@ a buffer with no associated file, or an `eval-region', return nil."
     provides))
 
 (defun file-requires (file)
-  "Return the list of features required by FILE."
+  "Return the list of features required by FILE as it was loaded.
+FILE can be a file name, or a library name.
+A library name is equivalent to the file name that `load-library' would load."
   (let ((symbols (file-loadhist-lookup file))
        requires)
     (mapc (lambda (x)
@@ -97,7 +99,9 @@ a buffer with no associated file, or an `eval-region', return nil."
 
 (defun file-dependents (file)
   "Return the list of loaded libraries that depend on FILE.
-This can include FILE itself."
+This can include FILE itself.
+FILE can be a file name, or a library name.
+A library name is equivalent to the file name that `load-library' would load."
   (let ((provides (file-provides file))
        (dependents nil))
     (dolist (x load-history dependents)
@@ -188,27 +192,34 @@ such as redefining an Emacs function."
                             (string-match "-hooks?\\'" (symbol-name x)))
                        (memq x unload-feature-special-hooks))) ; Known abnormal hooks etc.
           (dolist (y unload-hook-features-list)
-            (when (eq (car-safe y) 'defun)
-              (remove-hook x (cdr y))))))))
+            (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)
-         (progn
-           ;; Remove any feature names that this file provided.
-           (when (eq (car x) 'provide)
-             (setq features (delq (cdr x) features)))
-           (when (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))))))))
+         (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
@@ -217,8 +228,7 @@ such as redefining an Emacs function."
        (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)