From 9097e8af9ba17607c3c2253c18c0169fa55a916d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 26 Oct 2007 09:56:27 +0000 Subject: [PATCH] (isearch-buffers-multi): New option. (isearch-buffers-search-fun): Test it. --- etc/NEWS | 14 ++++++++------ lisp/ChangeLog | 15 +++++++++++++++ lisp/isearch-multi.el | 8 +++++++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index f56c16ad951..d2298233c83 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -153,12 +153,6 @@ history element containing the search string becomes the current. * New Modes and Packages in Emacs 23.1 -** The package isearch-multi.el has been added. It implements a new mode -`isearch-buffers-minor-mode' that allows isearch to search through -multiple buffers. In this mode a new variable -`isearch-buffers-next-buffer-function' defines the function to call -to get the next buffer to search in the series of multiple buffers. - ** The package doc-view.el has been added. It supports viewing of PDF, PostScript and DVI documents inside an Emacs buffer by converting the document to a set of PNG images first. One can also search for a @@ -177,6 +171,8 @@ When running isearch in a ChangeLog file, if the search fails, then another C-s tries searching the previous ChangeLog, if there is one (e.g. go from ChangeLog to ChangeLog.12). +This is enabled if isearch-buffers-multi is non-nil. + +++ ** In Dired-x, all command guesses for ! are now added to the default list accessible by M-n instead of pushing all guesses temporarily into @@ -432,6 +428,12 @@ forms to subroutines. * New Packages for Lisp Programming in Emacs 23.1 +** The package isearch-multi.el has been added. It implements a new mode +`isearch-buffers-minor-mode' that allows isearch to search through +multiple buffers. In this mode a new variable +`isearch-buffers-next-buffer-function' defines the function to call +to get the next buffer to search in the series of multiple buffers. + ** The new package avl-tree.el deals with the AVL tree data structure. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3af9590a0b..a8795f01001 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2007-10-26 Richard Stallman + + * isearch-multi.el (isearch-buffers-multi): New option. + (isearch-buffers-search-fun): Test it. + + * progmodes/ps-mode.el (ps-mode-map): Delete C-c v binding. + Put ps-run-clear on C-c C-l. + + * newcomment.el (comment-styles): New style indent-or-triple. + (comment-style): Make that the default. + (comment-add defvar): Doc fix. + (comment-add): Delete arg EXTRA. + (comment-region-default): Open code call to comment-add. + Handle indent-or-triple style which uses `multi-char' for INDENT. + 2007-10-26 Juanma Barranquero * eshell/em-unix.el (nil-blank-string): Doc fix. diff --git a/lisp/isearch-multi.el b/lisp/isearch-multi.el index cd5307b145a..acd456815a0 100644 --- a/lisp/isearch-multi.el +++ b/lisp/isearch-multi.el @@ -37,6 +37,12 @@ :version "23.1" :group 'isearch) +(defcustom isearch-buffers-multi t + "Non-nil enables searching multiple related buffers, in certain modes." + :type 'boolean + :version "23.1" + :group 'isearch-buffers) + (defcustom isearch-buffers-pause t "A choice defining where to pause the search. If the value is nil, don't pause before going to the next buffer. @@ -121,7 +127,7 @@ Intended to be added to `isearch-mode-hook'." ;; 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). - (unless bound + (when (and (not bound) isearch-buffers-multi) ;; If no-pause or there was one attempt to leave the current buffer (if (or (null isearch-buffers-pause) (and isearch-buffers-pause isearch-buffers-current-buffer)) -- 2.39.2