diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2017-07-27 22:51:37 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2017-07-27 22:51:37 -0400 |
| commit | 955e0cbb32225a53ac8b5b8f2235fb251d83f49e (patch) | |
| tree | 2592e3ec1c568c74987556ff8e83743d96cf6be0 | |
| parent | eaa5dc9d102d10c79f10bee1994ad922b8fcf9c4 (diff) | |
| download | emacs-955e0cbb32225a53ac8b5b8f2235fb251d83f49e.tar.gz | |
* lisp/loadhist.el (unload-feature): Remove ad-hoc ELP code
* lisp/emacs-lisp/elp.el (loadhist-unload-element): Un-instrument functions.
| -rw-r--r-- | lisp/emacs-lisp/elp.el | 5 | ||||
| -rw-r--r-- | lisp/loadhist.el | 5 |
2 files changed, 5 insertions, 5 deletions
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)))) |