mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-25 10:47:00 +00:00
9fc9a531a5
* lisp/comint.el (comint-history-isearch-message): Fix ambiguous doc string cross-reference(s). * lisp/ffap.el (ffap-string-at-point-region, ffap-next) (ffap-string-at-point, ffap-string-around) (ffap-copy-string-as-kill, ffap-highlight-overlay) (ffap-literally): Fix ambiguous doc string cross-reference(s). * lisp/font-lock.el (font-lock-keywords-alist) (font-lock-removed-keywords-alist): Fix ambiguous doc string cross-reference(s). * lisp/help-mode.el (help-xref-symbol-regexp): Add "call" as a hint for a cross-reference to a function. * lisp/info.el (Info-find-emacs-command-nodes): Fix ambiguous doc string cross-reference(s). * lisp/isearch.el (isearch-message-function, isearch-fail-pos): Fix ambiguous doc string cross-reference(s). * lisp/misearch.el (multi-isearch-next-buffer-function): Fix ambiguous doc string cross-reference(s). * lisp/newcomment.el (comment-box): Fix ambiguous doc string cross-reference(s). * lisp/printing.el (pr-txt-printer-alist, pr-ps-printer-alist) (pr-setting-database): Fix ambiguous doc string cross-reference(s). * lisp/ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces) (ps-n-up-filling-database): Fix ambiguous doc string cross-reference(s). * lisp/server.el (server-buffer, server-log): Fix ambiguous doc string cross-reference(s). * lisp/simple.el (newline, delete-backward-char, delete-forward-char) (minibuffer-history-isearch-message, kill-line, track-eol) (temporary-goal-column): Fix ambiguous doc string cross-reference(s). * lisp/whitespace.el (whitespace-point) (whitespace-font-lock-refontify, whitespace-bob-marker) (whitespace-eob-marker): Fix ambiguous doc string cross-reference(s). * lisp/calc/calc.el (calc-highlight-selections-with-faces) (calc-dispatch): Fix ambiguous doc string cross-reference(s). * lisp/emacs-lisp/edebug.el (edebug-read, edebug-eval-defun): Fix ambiguous doc string cross-reference(s). * lisp/gnus/gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string cross-reference(s). * lisp/gnus/gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string cross-reference(s). * lisp/international/mule.el (add-to-coding-system-list): Fix ambiguous doc string cross-reference(s). * lisp/progmodes/cc-fonts.el (c-font-lock-keywords-3) (c++-font-lock-keywords-3, objc-font-lock-keywords-3) (java-font-lock-keywords-3, idl-font-lock-keywords-3) (pike-font-lock-keywords-3): Fix ambiguous doc string cross-reference(s). * lisp/progmodes/compile.el (compile): Fix ambiguous doc string cross-reference(s). * lisp/progmodes/etags.el (tags-table-files) (tags-table-files-function, tags-included-tables-function): Fix ambiguous doc string cross-reference(s). * lisp/progmodes/gdb-mi.el (gdb, gdb-setup-windows) (gdb-restore-windows): Fix ambiguous doc string cross-reference(s). * lisp/textmodes/flyspell.el (flyspell-mark-duplications-flag) (flyspell-default-deplacement-commands): Fix ambiguous doc string cross-reference(s). * lisp/textmodes/ispell.el (ispell-accept-output): Fix ambiguous doc string cross-reference(s). * lisp/textmodes/sgml-mode.el (html-tag-help): Fix ambiguous doc string cross-reference(s). * lisp/vc/compare-w.el (compare-ignore-whitespace) (compare-ignore-case, compare-windows-dehighlight): Fix ambiguous doc string cross-reference(s). * lisp/vc/diff.el (diff): Fix ambiguous doc string cross-reference(s). * src/insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix ambiguous doc string cross-reference(s). * src/keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous doc string cross-reference(s). * src/window.c (Fwindow_point, syms_of_window): Fix ambiguous doc string cross-reference(s). Fixes: debbugs:12686
378 lines
14 KiB
EmacsLisp
378 lines
14 KiB
EmacsLisp
;;; misearch.el --- isearch extensions for multi-buffer search
|
||
|
||
;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
|
||
|
||
;; Author: Juri Linkov <juri@jurta.org>
|
||
;; Keywords: matching
|
||
|
||
;; This file is part of GNU Emacs.
|
||
|
||
;; GNU Emacs is free software: you can redistribute it and/or modify
|
||
;; it under the terms of the GNU General Public License as published by
|
||
;; the Free Software Foundation, either version 3 of the License, or
|
||
;; (at your option) any later version.
|
||
|
||
;; GNU Emacs is distributed in the hope that it will be useful,
|
||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
;; GNU General Public License for more details.
|
||
|
||
;; You should have received a copy of the GNU General Public License
|
||
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
||
|
||
;;; Commentary:
|
||
|
||
;; This file adds more dimensions to the search space. It implements
|
||
;; various features that extend isearch. One of them is an ability to
|
||
;; search through multiple buffers.
|
||
|
||
;;; Code:
|
||
|
||
;;; Search multiple buffers
|
||
|
||
;;;###autoload (add-hook 'isearch-mode-hook 'multi-isearch-setup)
|
||
|
||
(defgroup multi-isearch nil
|
||
"Using isearch to search through multiple buffers."
|
||
:version "23.1"
|
||
:group 'isearch)
|
||
|
||
(defcustom multi-isearch-search t
|
||
"Non-nil enables searching multiple related buffers, in certain modes."
|
||
:type 'boolean
|
||
:version "23.1"
|
||
:group 'multi-isearch)
|
||
|
||
(defcustom multi-isearch-pause t
|
||
"A choice defining where to pause the search.
|
||
If the value is nil, don't pause before going to the next buffer.
|
||
If the value is `initial', pause only after a failing search in the
|
||
initial buffer.
|
||
If t, pause in all buffers that contain the search string."
|
||
:type '(choice
|
||
(const :tag "Don't pause" nil)
|
||
(const :tag "Only in initial buffer" initial)
|
||
(const :tag "All buffers" t))
|
||
:version "23.1"
|
||
:group 'multi-isearch)
|
||
|
||
;;;###autoload
|
||
(defvar multi-isearch-next-buffer-function nil
|
||
"Function to call to get the next buffer to search.
|
||
|
||
When this variable is set to a function that returns a buffer, then
|
||
after typing another \\[isearch-forward] or \\[isearch-backward] \
|
||
at a failing search, the search goes
|
||
to the next buffer in the series and continues searching for the
|
||
next occurrence.
|
||
|
||
This function should return the next buffer (it doesn't need to switch
|
||
to it), or nil if it can't find the next buffer (when it reaches the
|
||
end of the search space).
|
||
|
||
The first argument of this function is the current buffer where the
|
||
search is currently searching. It defines the base buffer relative to
|
||
which this function should find the next buffer. When the isearch
|
||
direction is backward (when option `isearch-forward' is nil), this function
|
||
should return the previous buffer to search.
|
||
|
||
If the second argument of this function WRAP is non-nil, then it
|
||
should return the first buffer in the series; and for the backward
|
||
search, it should return the last buffer in the series.")
|
||
|
||
;;;###autoload
|
||
(defvar multi-isearch-next-buffer-current-function nil
|
||
"The currently active function to get the next buffer to search.
|
||
Initialized from `multi-isearch-next-buffer-function' when
|
||
Isearch starts.")
|
||
|
||
;;;###autoload
|
||
(defvar multi-isearch-current-buffer nil
|
||
"The buffer where the search is currently searching.
|
||
The value is nil when the search still is in the initial buffer.")
|
||
|
||
(defvar multi-isearch-orig-search-fun nil)
|
||
(defvar multi-isearch-orig-wrap nil)
|
||
(defvar multi-isearch-orig-push-state nil)
|
||
|
||
|
||
;;;###autoload
|
||
(defun multi-isearch-setup ()
|
||
"Set up isearch to search multiple buffers.
|
||
Intended to be added to `isearch-mode-hook'."
|
||
(when (and multi-isearch-search
|
||
multi-isearch-next-buffer-function)
|
||
(setq multi-isearch-current-buffer nil
|
||
multi-isearch-next-buffer-current-function
|
||
multi-isearch-next-buffer-function
|
||
multi-isearch-orig-search-fun
|
||
(default-value 'isearch-search-fun-function)
|
||
multi-isearch-orig-wrap
|
||
(default-value 'isearch-wrap-function)
|
||
multi-isearch-orig-push-state
|
||
(default-value 'isearch-push-state-function))
|
||
(setq-default isearch-search-fun-function 'multi-isearch-search-fun
|
||
isearch-wrap-function 'multi-isearch-wrap
|
||
isearch-push-state-function 'multi-isearch-push-state)
|
||
(add-hook 'isearch-mode-end-hook 'multi-isearch-end)))
|
||
|
||
(defun multi-isearch-end ()
|
||
"Clean up the multi-buffer search after terminating isearch."
|
||
(setq multi-isearch-current-buffer nil
|
||
multi-isearch-next-buffer-current-function nil)
|
||
(setq-default isearch-search-fun-function multi-isearch-orig-search-fun
|
||
isearch-wrap-function multi-isearch-orig-wrap
|
||
isearch-push-state-function multi-isearch-orig-push-state)
|
||
(remove-hook 'isearch-mode-end-hook 'multi-isearch-end))
|
||
|
||
(defun multi-isearch-search-fun ()
|
||
"Return the proper search function, for isearch in multiple buffers."
|
||
(lambda (string bound noerror)
|
||
(let ((search-fun
|
||
;; Use standard functions to search within one buffer
|
||
(isearch-search-fun-default))
|
||
found buffer)
|
||
(or
|
||
;; 1. First try searching in the initial buffer
|
||
(let ((res (funcall search-fun string bound noerror)))
|
||
;; Reset wrapping for all-buffers pause after successful search
|
||
(if (and res (not bound) (eq multi-isearch-pause t))
|
||
(setq multi-isearch-current-buffer nil))
|
||
res)
|
||
;; 2. If the above search fails, start visiting next/prev buffers
|
||
;; successively, and search the string in them. Do this only
|
||
;; when bound is nil (i.e. not while lazy-highlighting search
|
||
;; strings in the current buffer).
|
||
(when (and (not bound) multi-isearch-search)
|
||
;; If no-pause or there was one attempt to leave the current buffer
|
||
(if (or (null multi-isearch-pause)
|
||
(and multi-isearch-pause multi-isearch-current-buffer))
|
||
(condition-case nil
|
||
(progn
|
||
(while (not found)
|
||
;; Find the next buffer to search
|
||
(setq buffer (funcall multi-isearch-next-buffer-current-function
|
||
(or buffer (current-buffer)) nil))
|
||
(with-current-buffer buffer
|
||
(goto-char (if isearch-forward (point-min) (point-max)))
|
||
(setq isearch-barrier (point) isearch-opoint (point))
|
||
;; After visiting the next/prev buffer search the
|
||
;; string in it again, until the function in
|
||
;; multi-isearch-next-buffer-current-function raises
|
||
;; an error at the beginning/end of the buffer sequence.
|
||
(setq found (funcall search-fun string bound noerror))))
|
||
;; Set buffer for isearch-search-string to switch
|
||
(if buffer (setq multi-isearch-current-buffer buffer))
|
||
;; Return point of the new search result
|
||
found)
|
||
;; Return nil when multi-isearch-next-buffer-current-function fails
|
||
;; (`with-current-buffer' raises an error for nil returned from it).
|
||
(error (signal 'search-failed (list string "end of multi"))))
|
||
(signal 'search-failed (list string "repeat for next buffer"))))))))
|
||
|
||
(defun multi-isearch-wrap ()
|
||
"Wrap the multiple buffers search when search is failed.
|
||
Switch buffer to the first buffer for a forward search,
|
||
or to the last buffer for a backward search.
|
||
Set `multi-isearch-current-buffer' to the current buffer to display
|
||
the isearch suffix message [initial buffer] only when isearch leaves
|
||
the initial buffer."
|
||
(if (or (null multi-isearch-pause)
|
||
(and multi-isearch-pause multi-isearch-current-buffer))
|
||
(progn
|
||
(switch-to-buffer
|
||
(setq multi-isearch-current-buffer
|
||
(funcall multi-isearch-next-buffer-current-function
|
||
(current-buffer) t)))
|
||
(goto-char (if isearch-forward (point-min) (point-max))))
|
||
(setq multi-isearch-current-buffer (current-buffer))
|
||
(setq isearch-wrapped nil)))
|
||
|
||
(defun multi-isearch-push-state ()
|
||
"Save a function restoring the state of multiple buffers search.
|
||
Save the current buffer to the additional state parameter in the
|
||
search status stack."
|
||
`(lambda (cmd)
|
||
(multi-isearch-pop-state cmd ,(current-buffer))))
|
||
|
||
(defun multi-isearch-pop-state (_cmd buffer)
|
||
"Restore the multiple buffers search state.
|
||
Switch to the buffer restored from the search status stack."
|
||
(unless (equal buffer (current-buffer))
|
||
(switch-to-buffer (setq multi-isearch-current-buffer buffer))))
|
||
|
||
|
||
;;; Global multi-buffer search invocations
|
||
|
||
(defvar multi-isearch-buffer-list nil)
|
||
|
||
(defun multi-isearch-next-buffer-from-list (&optional buffer wrap)
|
||
"Return the next buffer in the series of buffers.
|
||
This function is used for multiple buffers Isearch. A sequence of
|
||
buffers is defined by the variable `multi-isearch-buffer-list'
|
||
set in `multi-isearch-buffers' or `multi-isearch-buffers-regexp'."
|
||
(let ((buffers (if isearch-forward
|
||
multi-isearch-buffer-list
|
||
(reverse multi-isearch-buffer-list))))
|
||
(if wrap
|
||
(car buffers)
|
||
(cadr (member buffer buffers)))))
|
||
|
||
(defvar ido-ignore-item-temp-list) ; from ido.el
|
||
|
||
(defun multi-isearch-read-buffers ()
|
||
"Return a list of buffers specified interactively, one by one."
|
||
;; Most code from `multi-occur'.
|
||
(let* ((bufs (list (read-buffer "First buffer to search: "
|
||
(current-buffer) t)))
|
||
(buf nil)
|
||
(ido-ignore-item-temp-list bufs))
|
||
(while (not (string-equal
|
||
(setq buf (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))
|
||
""))
|
||
(add-to-list 'bufs buf)
|
||
(setq ido-ignore-item-temp-list bufs))
|
||
(nreverse bufs)))
|
||
|
||
(defun multi-isearch-read-matching-buffers ()
|
||
"Return a list of buffers whose names match specified regexp."
|
||
;; Most code from `multi-occur-in-matching-buffers'
|
||
;; and `kill-matching-buffers'.
|
||
(let ((bufregexp
|
||
(read-regexp "Search in buffers whose names match regexp")))
|
||
(when bufregexp
|
||
(delq nil (mapcar (lambda (buf)
|
||
(when (string-match bufregexp (buffer-name buf))
|
||
buf))
|
||
(buffer-list))))))
|
||
|
||
;;;###autoload
|
||
(defun multi-isearch-buffers (buffers)
|
||
"Start multi-buffer Isearch on a list of BUFFERS.
|
||
This list can contain live buffers or their names.
|
||
Interactively read buffer names to search, one by one, ended with RET.
|
||
With a prefix argument, ask for a regexp, and search in buffers
|
||
whose names match the specified regexp."
|
||
(interactive
|
||
(list (if current-prefix-arg
|
||
(multi-isearch-read-matching-buffers)
|
||
(multi-isearch-read-buffers))))
|
||
(let ((multi-isearch-next-buffer-function
|
||
'multi-isearch-next-buffer-from-list)
|
||
(multi-isearch-buffer-list (mapcar #'get-buffer buffers)))
|
||
(switch-to-buffer (car multi-isearch-buffer-list))
|
||
(goto-char (if isearch-forward (point-min) (point-max)))
|
||
(isearch-forward)))
|
||
|
||
;;;###autoload
|
||
(defun multi-isearch-buffers-regexp (buffers)
|
||
"Start multi-buffer regexp Isearch on a list of BUFFERS.
|
||
This list can contain live buffers or their names.
|
||
Interactively read buffer names to search, one by one, ended with RET.
|
||
With a prefix argument, ask for a regexp, and search in buffers
|
||
whose names match the specified regexp."
|
||
(interactive
|
||
(list (if current-prefix-arg
|
||
(multi-isearch-read-matching-buffers)
|
||
(multi-isearch-read-buffers))))
|
||
(let ((multi-isearch-next-buffer-function
|
||
'multi-isearch-next-buffer-from-list)
|
||
(multi-isearch-buffer-list (mapcar #'get-buffer buffers)))
|
||
(switch-to-buffer (car multi-isearch-buffer-list))
|
||
(goto-char (if isearch-forward (point-min) (point-max)))
|
||
(isearch-forward-regexp)))
|
||
|
||
|
||
;;; Global multi-file search invocations
|
||
|
||
(defvar multi-isearch-file-list nil)
|
||
|
||
(defun multi-isearch-next-file-buffer-from-list (&optional buffer wrap)
|
||
"Return the next buffer in the series of file buffers.
|
||
This function is used for multiple file buffers Isearch. A sequence
|
||
of files is defined by the variable `multi-isearch-file-list' set in
|
||
`multi-isearch-files' or `multi-isearch-files-regexp'.
|
||
Every next/previous file in the defined sequence is visited by
|
||
`find-file-noselect' that returns the corresponding file buffer."
|
||
(let ((files (if isearch-forward
|
||
multi-isearch-file-list
|
||
(reverse multi-isearch-file-list))))
|
||
(find-file-noselect
|
||
(if wrap
|
||
(car files)
|
||
(cadr (member (buffer-file-name buffer) files))))))
|
||
|
||
(defun multi-isearch-read-files ()
|
||
"Return a list of files specified interactively, one by one."
|
||
;; Most code from `multi-occur'.
|
||
(let* ((files (list (read-file-name "First file to search: "
|
||
default-directory
|
||
buffer-file-name)))
|
||
(file nil))
|
||
(while (not (string-equal
|
||
(setq file (read-file-name
|
||
"Next file to search (RET to end): "
|
||
default-directory
|
||
default-directory))
|
||
default-directory))
|
||
(add-to-list 'files file))
|
||
(nreverse files)))
|
||
|
||
(defun multi-isearch-read-matching-files ()
|
||
"Return a list of files whose names match specified wildcard."
|
||
;; Most wildcard code from `find-file-noselect'.
|
||
(let ((filename (read-regexp "Search in files whose names match wildcard")))
|
||
(when (and filename
|
||
(not (string-match "\\`/:" filename))
|
||
(string-match "[[*?]" filename))
|
||
(condition-case nil
|
||
(file-expand-wildcards filename t)
|
||
(error (list filename))))))
|
||
|
||
;;;###autoload
|
||
(defun multi-isearch-files (files)
|
||
"Start multi-buffer Isearch on a list of FILES.
|
||
Relative file names in this list are expanded to absolute
|
||
file names using the current buffer's value of `default-directory'.
|
||
Interactively read file names to search, one by one, ended with RET.
|
||
With a prefix argument, ask for a wildcard, and search in file buffers
|
||
whose file names match the specified wildcard."
|
||
(interactive
|
||
(list (if current-prefix-arg
|
||
(multi-isearch-read-matching-files)
|
||
(multi-isearch-read-files))))
|
||
(let ((multi-isearch-next-buffer-function
|
||
'multi-isearch-next-file-buffer-from-list)
|
||
(multi-isearch-file-list (mapcar #'expand-file-name files)))
|
||
(find-file (car multi-isearch-file-list))
|
||
(goto-char (if isearch-forward (point-min) (point-max)))
|
||
(isearch-forward)))
|
||
|
||
;;;###autoload
|
||
(defun multi-isearch-files-regexp (files)
|
||
"Start multi-buffer regexp Isearch on a list of FILES.
|
||
Relative file names in this list are expanded to absolute
|
||
file names using the current buffer's value of `default-directory'.
|
||
Interactively read file names to search, one by one, ended with RET.
|
||
With a prefix argument, ask for a wildcard, and search in file buffers
|
||
whose file names match the specified wildcard."
|
||
(interactive
|
||
(list (if current-prefix-arg
|
||
(multi-isearch-read-matching-files)
|
||
(multi-isearch-read-files))))
|
||
(let ((multi-isearch-next-buffer-function
|
||
'multi-isearch-next-file-buffer-from-list)
|
||
(multi-isearch-file-list (mapcar #'expand-file-name files)))
|
||
(find-file (car multi-isearch-file-list))
|
||
(goto-char (if isearch-forward (point-min) (point-max)))
|
||
(isearch-forward-regexp)))
|
||
|
||
|
||
(provide 'multi-isearch)
|
||
(provide 'misearch)
|
||
;;; misearch.el ends here
|