(unload-function-features-list): Rename from `unload-hook-features-list'.

(unload-hook-features-list): Add as obsolete alias.
(unload-feature): Use `unload-function-features-list'
and new FEATURE-unload-function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c24221f..d24869a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,17 @@
+2007-10-19  Juanma Barranquero  <lekktu@gmail.com>
+
+       * loadhist.el (unload-function-features-list):
+       Rename from `unload-hook-features-list'.
+       (unload-hook-features-list): Add as obsolete alias.
+       (unload-feature): Use `unload-function-features-list'
+       and new FEATURE-unload-function.
+
 2007-10-19  Glenn Morris  <rgm@gnu.org>
 
        * bindings.el (mouse-minor-mode-menu)
        (minor-mode-menu-from-indicator): Move to mouse.el.
        * mouse.el (mouse-minor-mode-menu, minor-mode-menu-from-indicator):
-       Move here from bindings.el
+       Move here from bindings.el.
 
 2007-10-19  Richard Stallman  <rms@gnu.org>
 
@@ -35,10 +43,10 @@
        * doc-view.el (doc-view-dvi->pdf-sentinel, doc-view-dvi->pdf)
        (doc-view-pdf/ps->png-sentinel, doc-view-pdf/ps->png)
        (doc-view-pdf->txt-sentinel, doc-view-pdf->txt)
-       (doc-view-ps->pdf-sentinel, doc-view-ps->pdf): Remove superfluous
-       messages.
-       (doc-view-mode-map): Use the image-mode scrolling commands.  Don't
-       rebind C-x k.
+       (doc-view-ps->pdf-sentinel, doc-view-ps->pdf):
+       Remove superfluous messages.
+       (doc-view-mode-map): Use the image-mode scrolling commands.
+       Don't rebind C-x k.
 
 2007-10-18  Reiner Steib  <Reiner.Steib@gmx.de>
 

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 95de0d8..cd8c8ef 100644 (file)
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -137,11 +137,13 @@ 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
+(defvar unload-function-features-list nil
   "List of features of the package being unloaded.
 
-This is meant to be used by FEATURE-unload-hook hooks, see the
+This is meant to be used by FEATURE-unload-function, see the
 documentation of `unload-feature' for details.")
+(define-obsolete-variable-alias 'unload-hook-features-list
+    'unload-function-features-list "22.2")
 
 ;;;###autoload
 (defun unload-feature (feature &optional force)
@@ -172,82 +174,88 @@ such as redefining an Emacs function."
       (when dependents
        (error "Loaded libraries %s depend on %s"
               (prin1-to-string dependents) file))))
-  (let* ((unload-hook-features-list (feature-symbols feature))
-         (file (pop unload-hook-features-list))
+  (let* ((unload-function-features-list (feature-symbols feature))
+         (file (pop unload-function-features-list))
         ;; If non-nil, this is a symbol for which we should
         ;; restore a previous autoload if possible.
         restore-autoload
-         (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 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
-      ;; which seem to be hook variables or special hook functions and
-      ;; remove anything from them which matches the feature-symbols
-      ;; about to get zapped.  Obviously this won't get anonymous
-      ;; functions which the package might just have installed, and
-      ;; there might be other important state, but this tactic
-      ;; normally works.
-      (mapatoms
-       (lambda (x)
-         (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))))
+        (name (symbol-name feature))
+         (unload-hook (intern-soft (concat name "-unload-hook")))
+        (unload-func (intern-soft (concat name "-unload-function"))))
+    ;; If FEATURE-unload-function is defined and returns non-nil,
+    ;; don't try to do anything more; otherwise proceed normally.
+    (unless (and (bound-and-true-p unload-func)
+                (funcall unload-func))
+      ;; 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.)
+      (if unload-hook
+         ;; First off, provide a clean way for package FOO to arrange
+         ;; this by adding hooks on the variable `FOO-unload-hook'.
+         ;; This is obsolete; FEATURE-unload-function should be used now.
+         (run-hooks unload-hook)
+       ;; Otherwise, do our best.  Look through the obarray for symbols
+       ;; which seem to be hook variables or special hook functions and
+       ;; remove anything from them which matches the feature-symbols
+       ;; about to get zapped.  Obviously this won't get anonymous
+       ;; functions which the package might just have installed, and
+       ;; there might be other important state, but this tactic
+       ;; normally works.
+       (mapatoms
+        (lambda (x)
+          (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-function-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-function-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-function-features-list)
+         (when (symbolp elt)
+           (elp-restore-function elt))))
 
-    (dolist (x unload-hook-features-list)
-      (if (consp x)
-         (case (car x)
-          ;; Remove any feature names that this file provided.
-          (provide
-           (setq features (delq (cdr x) features)))
-          ((defun autoload)
-           (let ((fun (cdr x)))
-             (when (fboundp fun)
-               (when (fboundp 'ad-unadvise)
-                 (ad-unadvise fun))
-               (let ((aload (get fun 'autoload)))
-                 (if (and aload (eq fun restore-autoload))
-                      (fset fun (cons 'autoload aload))
-                    (fmakunbound fun))))))
-          ;; (t . SYMBOL) comes before (defun . SYMBOL)
-          ;; and says we should restore SYMBOL's autoload
-          ;; when we undefine it.
-          ((t) (setq restore-autoload (cdr x)))
-           ((require defface) nil)
-          (t (message "Unexpected element %s in load-history" x)))
-       ;; Kill local values as much as possible.
-       (dolist (buf (buffer-list))
-         (with-current-buffer buf
-            (if (and (boundp x) (timerp (symbol-value x)))
-                (cancel-timer (symbol-value x)))
-           (kill-local-variable x)))
-        (if (and (boundp x) (timerp (symbol-value x)))
-            (cancel-timer (symbol-value 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.
-    (setq load-history (delq (assoc file load-history) load-history)))
+      (dolist (x unload-function-features-list)
+       (if (consp x)
+           (case (car x)
+             ;; Remove any feature names that this file provided.
+             (provide
+              (setq features (delq (cdr x) features)))
+             ((defun autoload)
+              (let ((fun (cdr x)))
+                (when (fboundp fun)
+                  (when (fboundp 'ad-unadvise)
+                    (ad-unadvise fun))
+                  (let ((aload (get fun 'autoload)))
+                    (if (and aload (eq fun restore-autoload))
+                        (fset fun (cons 'autoload aload))
+                      (fmakunbound fun))))))
+             ;; (t . SYMBOL) comes before (defun . SYMBOL)
+             ;; and says we should restore SYMBOL's autoload
+             ;; when we undefine it.
+             ((t) (setq restore-autoload (cdr x)))
+             ((require defface) nil)
+             (t (message "Unexpected element %s in load-history" x)))
+         ;; Kill local values as much as possible.
+         (dolist (buf (buffer-list))
+           (with-current-buffer buf
+             (if (and (boundp x) (timerp (symbol-value x)))
+                 (cancel-timer (symbol-value x)))
+             (kill-local-variable x)))
+         (if (and (boundp x) (timerp (symbol-value x)))
+             (cancel-timer (symbol-value 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.
+      (setq load-history (delq (assoc file load-history) load-history))))
   ;; Don't return load-history, it is not useful.
   nil)