[Emacs-diffs] trunk r118337: * lisp/isearch.el (isearch-message-prefix): Show "Multi-file" and

[Juri Linkov]

------------------------------------------------------------
revno: 118337
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/13592
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-09 21:19:54 +0200
message:
  * lisp/isearch.el (isearch-message-prefix): Show "Multi-file" and
  "Multi-buffer" instead of "Multi".
  
  * lisp/misearch.el (multi-isearch-file-list): Autoload
  multi-isearch-buffer-list and multi-isearch-file-list.
  (multi-isearch-end): Reset multi-isearch-buffer-list and
  multi-isearch-file-list to nil.
  
  * doc/emacs/search.texi (Other Repeating Search): Add documentation for
  multi-isearch-files and multi-isearch-files-regexp.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/search.texi          
search.texi-20091113204419-o5vbwnq5f7feedwu-6276
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/isearch.el                isearch.el-20091113204419-o5vbwnq5f7feedwu-486
  lisp/misearch.el               
misearch.el-20091113204419-o5vbwnq5f7feedwu-8754

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-11-09 02:06:29 +0000
+++ b/doc/emacs/ChangeLog       2014-11-09 19:19:54 +0000
@@ -1,3 +1,8 @@
+2014-11-09  Juri Linkov  <address@hidden>
+
+       * search.texi (Other Repeating Search): Add documentation for
+       multi-isearch-files and multi-isearch-files-regexp.  (Bug#13592)
+
 2014-11-09  Glenn Morris  <address@hidden>
 
        * Makefile.in (version): Remove variable.

=== modified file 'doc/emacs/search.texi'
--- a/doc/emacs/search.texi     2014-10-24 09:13:01 +0000
+++ b/doc/emacs/search.texi     2014-11-09 19:19:54 +0000
@@ -1436,6 +1436,22 @@
 This command is just like @code{multi-isearch-buffers}, except it
 performs an incremental regexp search.
 
address@hidden M-x multi-isearch-files
+Prompt for one or more file names, ending with @key{RET}; then,
+begin a multi-file incremental search in those files.  (If the
+search fails in one file, the next @kbd{C-s} tries searching the
+next specified file, and so forth.)  With a prefix argument, prompt
+for a regexp and begin a multi-file incremental search in files
+matching that regexp.
+
address@hidden M-x multi-isearch-files-regexp
+This command is just like @code{multi-isearch-files}, except it
+performs an incremental regexp search.
+
+In some modes that set the buffer-local variable
address@hidden (e.g., in Change Log mode)
+a multi-file incremental search is activated automatically.
+
 @cindex Occur mode
 @cindex mode, Occur
 @item M-x occur

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-09 05:14:25 +0000
+++ b/lisp/ChangeLog    2014-11-09 19:19:54 +0000
@@ -1,3 +1,13 @@
+2014-11-09  Juri Linkov  <address@hidden>
+
+       * isearch.el (isearch-message-prefix): Show "Multi-file" and
+       "Multi-buffer" instead of "Multi".  (Bug#13592)
+
+       * misearch.el (multi-isearch-file-list): Autoload
+       multi-isearch-buffer-list and multi-isearch-file-list.
+       (multi-isearch-end): Reset multi-isearch-buffer-list and
+       multi-isearch-file-list to nil.
+
 2014-11-09  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment):

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2014-11-07 23:33:41 +0000
+++ b/lisp/isearch.el   2014-11-09 19:19:54 +0000
@@ -2514,7 +2514,10 @@
                           "word ")
                     "")
                   (if isearch-regexp "regexp " "")
-                  (if multi-isearch-next-buffer-current-function "multi " "")
+                  (cond
+                   (multi-isearch-file-list "multi-file ")
+                   (multi-isearch-buffer-list "multi-buffer ")
+                   (t ""))
                   (or isearch-message-prefix-add "")
                   (if nonincremental "search" "I-search")
                   (if isearch-forward "" " backward")

=== modified file 'lisp/misearch.el'
--- a/lisp/misearch.el  2014-02-14 06:59:24 +0000
+++ b/lisp/misearch.el  2014-11-09 19:19:54 +0000
@@ -91,6 +91,11 @@
   "The buffer where the search is currently searching.
 The value is nil when the search still is in the initial buffer.")
 
+;;;###autoload
+(defvar multi-isearch-buffer-list nil)
+;;;###autoload
+(defvar multi-isearch-file-list nil)
+
 (defvar multi-isearch-orig-search-fun nil)
 (defvar multi-isearch-orig-wrap nil)
 (defvar multi-isearch-orig-push-state nil)
@@ -119,7 +124,9 @@
 (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)
+       multi-isearch-next-buffer-current-function nil
+       multi-isearch-buffer-list nil
+       multi-isearch-file-list 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)
@@ -204,8 +211,6 @@
 
 ;;; 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
@@ -290,8 +295,6 @@
 
 ;;; 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