# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 969218959 0
# Node ID 7661306a5b4e9b3dc6e62b5813c9f0cbf726f2b1
# Parent  6d39ec089c7ba832039e821cb3102d15f6d383ba
(unload-feature): Maybe call elp-restore-list and
ad-unadvise.

diff -r 6d39ec089c7b -r 7661306a5b4e lisp/loadhist.el
--- a/lisp/loadhist.el	Sun Sep 17 17:44:47 2000 +0000
+++ b/lisp/loadhist.el	Sun Sep 17 19:29:19 2000 +0000
@@ -154,6 +154,8 @@
                       (memq x loadhist-hook-functions)))
 	     (dolist (y (cdr flist))
 	       (remove-hook x y))))))
+    (if (fboundp 'elp-restore-list)
+	(elp-restore-list (cdr flist)))
     (mapc
      (lambda (x)
        (cond ((stringp x) nil)
@@ -165,6 +167,8 @@
 	      (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))))))))