From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 28 Jul 2017 02:51:37 +0000 (-0400)
Subject: * lisp/loadhist.el (unload-feature): Remove ad-hoc ELP code
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~1542^2~90
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=955e0cbb32225a53ac8b5b8f2235fb251d83f49e;p=emacs.git

* lisp/loadhist.el (unload-feature): Remove ad-hoc ELP code

* lisp/emacs-lisp/elp.el (loadhist-unload-element): Un-instrument functions.
---

diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index d4500f131a2..7bdd749d5ab 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -583,6 +583,11 @@ displayed."
   (elp-restore-all)
   ;; continue standard unloading
   nil)
+
+(cl-defmethod loadhist-unload-element :before :extra "elp" ((x (head defun)))
+  "Un-instrument before unloading a function."
+  (elp-restore-function (cdr x)))
+
 
 (provide 'elp)
 
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 24c3acd1b99..b83d023ccf8 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -301,11 +301,6 @@ something strange, such as redefining an Emacs function."
       ;; Change major mode in all buffers using one defined in the feature being unloaded.
       (unload--set-major-mode)
 
-      (when (fboundp 'elp-restore-function) ; remove ELP stuff first
-	(dolist (elt unload-function-defs-list)
-	  (when (symbolp elt)
-	    (elp-restore-function elt))))
-
       (mapc #'loadhist-unload-element unload-function-defs-list)
       ;; Delete the load-history element for this file.
       (setq load-history (delq (assoc file load-history) load-history))))