(undigestify-rmail-message): Better error messages.

[bpt/emacs.git] / lisp / loadhist.el

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 11c6b1e..6b473bb 100644 (file)
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -1,9 +1,26 @@
 ;;; loadhist.el --- lisp functions for working with feature groups
+;;; Copyright (C) 1995 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Version: 1.0
 ;; Keywords: internal
 
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+
 ;;; Commentary:
 
 ;; These functions exploit the load-history system variable.
@@ -36,7 +53,7 @@ Actually, return the load argument, if any; this is sometimes the name of a
 Lisp file without an extension.  If the feature came from an eval-buffer on
 a buffer with no associated file, or an eval-region, return nil."
   (if (not (featurep feature))
-      (error "%s is not a currently loaded feature." (symbol-name feature))
+      (error "%s is not a currently loaded feature" (symbol-name feature))
     (car (feature-symbols feature))))
 
 (defun file-provides (file)
@@ -61,7 +78,7 @@ a buffer with no associated file, or an eval-region, return nil."
     requires
     ))
 
-(defun set-intersect (p q)
+(defun file-set-intersect (p q)
   ;; Return the set intersection of two lists
   (let ((ret nil))
     (mapcar
@@ -71,11 +88,12 @@ 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.
+  "Return the list of loaded libraries that depend on FILE.
+This can include FILE itself."
   (let ((provides (file-provides file)) (dependents nil))
     (mapcar
      (function (lambda (x) 
-                (if (set-intersect provides (file-requires (car x)))
+                (if (file-set-intersect provides (file-requires (car x)))
                     (setq dependents (cons (car x) dependents)))))
      load-history)
     dependents
@@ -88,24 +106,31 @@ If the feature is required by any other loaded code, and optional FORCE
 is nil, raise an error."
   (interactive "SFeature: ")
   (if (not (featurep feature))
-      (error "%s is not a currently loaded feature." (symbol-name feature)))
+      (error "%s is not a currently loaded feature" (symbol-name feature)))
   (if (not force)
-      (let* ((file (feature-file feature)) (dependents (file-dependents file)))
+      (let* ((file (feature-file feature))
+            (dependents (delete file (copy-sequence (file-dependents file)))))
        (if dependents
-           (error "Loaded libraries %s depend on %s."
+           (error "Loaded libraries %s depend on %s"
                   (prin1-to-string dependents) file)
            )))
   (let* ((flist (feature-symbols feature)) (file (car flist)))
     (mapcar
      (function (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))))
                       ((boundp x) (makunbound x))
                       ((fboundp x)
                        (fmakunbound x)
                        (let ((aload (get x 'autoload)))
-                         (if aload (fset x aload))))))
-              )
-     (cdr flist))))
+                         (if aload (fset x (cons 'autoload aload))))))))
+     (cdr flist))
+    ;; Delete the load-history element for this file.
+    (let ((elt (assoc file load-history)))
+      (setq load-history (delq elt load-history)))))
 
 (provide 'loadhist)