X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/54efd2ab176dd6cc33bb1e86a9c37908c26d0a46..ca1b9b38dcf372b09028acf088f386ef09f2de84:/lisp/misearch.el diff --git a/lisp/misearch.el b/lisp/misearch.el index dcc819564f..1b9cc9288c 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -1,6 +1,6 @@ ;;; misearch.el --- isearch extensions for multi-buffer search -;; Copyright (C) 2007-2015 Free Software Foundation, Inc. +;; Copyright (C) 2007-2016 Free Software Foundation, Inc. ;; Author: Juri Linkov ;; Keywords: matching @@ -92,9 +92,12 @@ Isearch starts.") The value is nil when the search still is in the initial buffer.") ;;;###autoload -(defvar multi-isearch-buffer-list nil) +(defvar multi-isearch-buffer-list nil + "Sequence of buffers visited by multiple buffers Isearch. +This is nil if Isearch is not currently searching more than one buffer.") ;;;###autoload -(defvar multi-isearch-file-list nil) +(defvar multi-isearch-file-list nil + "Sequence of files visited by multiple file buffers Isearch.") (defvar multi-isearch-orig-search-fun nil) (defvar multi-isearch-orig-wrap nil) @@ -234,7 +237,7 @@ set in `multi-isearch-buffers' or `multi-isearch-buffers-regexp'." (ido-ignore-item-temp-list bufs)) (while (not (string-equal (setq buf (read-buffer - (if (eq read-buffer-function 'ido-read-buffer) + (if (eq read-buffer-function #'ido-read-buffer) "Next buffer to search (C-j to end): " "Next buffer to search (RET to end): ") nil t)) @@ -377,6 +380,8 @@ whose file names match the specified wildcard." (goto-char (if isearch-forward (point-min) (point-max))) (isearch-forward-regexp nil t))) +(defvar unload-function-defs-list) + (defun multi-isearch-unload-function () "Remove autoloaded variables from `unload-function-defs-list'. Also prevent the feature from being reloaded via `isearch-mode-hook'."