[Emacs-diffs] emacs/lisp/textmodes reftex-global.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     08/12/28 23:46:34

Modified files:
        lisp/textmodes : reftex-global.el 

Log message:
        (reftex-isearch-switch-to-next-file):
        Use `find-file-noselect' instead of `find-file' (for Emacs 22 and 23).
        (reftex-isearch-minor-mode): If `multi-isearch-next-buffer-function'
        is bound set it to `reftex-isearch-switch-to-next-file'.  Otherwise,
        set 4 obsolete variables for backward-compatibility with Emacs 22.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/reftex-global.el?cvsroot=emacs&r1=1.38&r2=1.39

Patches:
Index: reftex-global.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/reftex-global.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- reftex-global.el    6 May 2008 04:33:10 -0000       1.38
+++ reftex-global.el    28 Dec 2008 23:46:34 -0000      1.39
@@ -343,6 +343,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 
@@ -416,7 +424,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)
@@ -438,6 +446,9 @@
            (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)
@@ -445,16 +456,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.