[AUCTeX-diffs] Changes to reftex/lisp/reftex-global.el,v

[Ralf Angeli]

CVSROOT:        /sources/auctex
Module name:    reftex
Changes by:     Ralf Angeli <angeli>    09/02/08 16:47:22

Index: reftex-global.el
===================================================================
RCS file: /sources/auctex/reftex/lisp/reftex-global.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- reftex-global.el    3 May 2008 09:18:46 -0000       1.34
+++ reftex-global.el    8 Feb 2009 16:47:22 -0000       1.35
@@ -1,7 +1,7 @@
 ;;; reftex-global.el --- operations on entire documents with RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007 Free Software Foundation, Inc.
+;;   2006, 2007, 2009 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <address@hidden>
 ;; Maintainer: address@hidden
@@ -345,6 +345,14 @@
                               (buffer-name buf)))
             (error "Abort"))))))
 
+;;; Multi-file RefTeX Isearch
+
+;;; `reftex-isearch-wrap-function', `reftex-isearch-push-state-function',
+;;; `reftex-isearch-pop-state-function', `reftex-isearch-isearch-search'
+;;; functions remain here only for backward-compatibility with Emacs 22
+;;; and are obsolete since Emacs 23 that supports a single function
+;;; variable `multi-isearch-next-buffer-function'.
+
 (defun reftex-isearch-wrap-function ()
   (if (not isearch-word)
       (switch-to-buffer 
@@ -418,7 +426,7 @@
          (setq flist (cdr flist)))
        (setq flist (cdr flist)))
       (when flist
-       (find-file (car flist))))))
+       (find-file-noselect (car flist))))))
 
 ;;;###autoload
 (defun reftex-isearch-minor-mode (&optional arg)
@@ -440,6 +448,10 @@
            (dolist (crt-buf (buffer-list))
              (with-current-buffer crt-buf
                (when reftex-mode
+                 (if (boundp 'multi-isearch-next-buffer-function)
+                     (set (make-local-variable
+                           'multi-isearch-next-buffer-function)
+                          'reftex-isearch-switch-to-next-file)
                  (set (make-local-variable 'isearch-wrap-function)
                       'reftex-isearch-wrap-function)
                  (set (make-local-variable 'isearch-search-fun-function)
@@ -447,16 +459,18 @@
                  (set (make-local-variable 'isearch-push-state-function)
                       'reftex-isearch-push-state-function)
                  (set (make-local-variable 'isearch-next-buffer-function)
-                      'reftex-isearch-switch-to-next-file)
+                        'reftex-isearch-switch-to-next-file))
                  (setq reftex-isearch-minor-mode t))))
            (add-hook 'reftex-mode-hook 'reftex-isearch-minor-mode))
        (dolist (crt-buf (buffer-list))
          (with-current-buffer crt-buf
            (when reftex-mode
+             (if (boundp 'multi-isearch-next-buffer-function)
+                 (kill-local-variable 'multi-isearch-next-buffer-function)
              (kill-local-variable 'isearch-wrap-function)
              (kill-local-variable 'isearch-search-fun-function)
              (kill-local-variable 'isearch-push-state-function)
-             (kill-local-variable 'isearch-next-buffer-function)
+               (kill-local-variable 'isearch-next-buffer-function))
              (setq reftex-isearch-minor-mode nil))))
        (remove-hook 'reftex-mode-hook 'reftex-isearch-minor-mode)))
     ;; Force modeline redisplay.