Unloading support for misearch.

* lisp/misearch.el (multi-isearch-unload-function): New function.
(misearch-unload-function): New alias.

Fixes: debbugs:19566

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60732e781fc2a159bc451b7eee950416d8491419..bf5f60db13e59c3cd0ae35bcc4aaaa8d1991da91 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -17,6 +17,9 @@
        * desktop.el (desktop-read): Do not call desktop-clear when no
        desktop file is found.  (Bug#18371)
 
+       * misearch.el (multi-isearch-unload-function): New function.
+       (misearch-unload-function): New alias.  (Bug#19566)
+
 2015-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/eieio-core.el (eieio--class-constructor): Rename from

diff --git a/lisp/misearch.el b/lisp/misearch.el
index 6daae243fbb53e106717307cfda64da712982a09..dcc819564fb62bbdcd057d410ad2d4637f4eed04 100644 (file)
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -377,6 +377,25 @@ whose file names match the specified wildcard."
     (goto-char (if isearch-forward (point-min) (point-max)))
     (isearch-forward-regexp nil t)))
 
+(defun multi-isearch-unload-function ()
+  "Remove autoloaded variables from `unload-function-defs-list'.
+Also prevent the feature from being reloaded via `isearch-mode-hook'."
+  (remove-hook 'isearch-mode-hook 'multi-isearch-setup)
+  (let ((defs (list (car unload-function-defs-list)))
+       (auto '(multi-isearch-next-buffer-function
+               multi-isearch-next-buffer-current-function
+               multi-isearch-current-buffer
+               multi-isearch-buffer-list multi-isearch-file-list)))
+    (dolist (def (cdr unload-function-defs-list))
+      (unless (and (symbolp def)
+                  (memq def auto))
+       (push def defs)))
+    (setq unload-function-defs-list (nreverse defs))
+    ;; .
+    nil))
+
+(defalias 'misearch-unload-function 'multi-isearch-unload-function)
+
 \f
 (provide 'multi-isearch)
 (provide 'misearch)