# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 972993771 0
# Node ID 51c874361c842db666b33b8a5ee8a9d28c86d4dc
# Parent  46fe3d0d327bdf19fd22ceb9bf32206c0a041563
(unload-feature): Call elp-restore-function,
checking for symbols; don't use elp-restore-all.
(loadhist-hook-functions): Doc fix.

diff -r 46fe3d0d327b -r 51c874361c84 lisp/loadhist.el
--- a/lisp/loadhist.el	Tue Oct 31 11:57:12 2000 +0000
+++ b/lisp/loadhist.el	Tue Oct 31 12:02:51 2000 +0000
@@ -107,7 +107,7 @@
 redisplay-end-trigger-functions temp-buffer-show-function
 window-scroll-functions window-size-change-functions
 write-region-annotate-functions)
-  "A list of special hooks from the `Standard Hooks' node of the Lisp manual.
+  "A list of special hooks from Info node `(elisp)Standard Hooks'.
 
 These are symbols with hook-type values whose names don't end in
 `-hook' or `-hooks', from which `unload-feature' tries to remove
@@ -154,8 +154,10 @@
                       (memq x loadhist-hook-functions)))
 	     (dolist (y (cdr flist))
 	       (remove-hook x y))))))
-    (if (fboundp 'elp-restore-list)
-	(elp-restore-list (cdr flist)))
+    (if (fboundp 'elp-restore-function)	; remove ELP stuff first
+	(dolist (elt (cdr flist))
+	  (if (symbolp elt)
+	      (elp-restore-function elt))))
     (mapc
      (lambda (x)
        (cond ((stringp x) nil)