(elp-instrument-package): Don't instrument keymaps and autoloaded functions.

diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 37ade7b5b7365c41d0edd4d0c5f398337c1b32cb..7c07e900b38f69f2727463153371096f784af72a 100644 (file)
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -300,9 +300,9 @@ For example, to instrument all ELP functions, do the following:
                                    (function
                                     (lambda (sym)
                                       (and (fboundp sym)
-                                           (not (eq (car-safe
-                                                     (symbol-function sym))
-                                                    'macro)))))))))
+                                           (not (memq (car-safe
+                                                       (symbol-function sym))
+                                                      '(macro keymap autoload))))))))))
 
 (defun elp-restore-list (&optional list)
   "Restore the original definitions for all functions in `elp-function-list'.