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

[Juanma Barranquero]

Index: emacs/lisp/textmodes/reftex-global.el
diff -c emacs/lisp/textmodes/reftex-global.el:1.22 
emacs/lisp/textmodes/reftex-global.el:1.23
*** emacs/lisp/textmodes/reftex-global.el:1.22  Sat Aug  6 17:41:15 2005
--- emacs/lisp/textmodes/reftex-global.el       Wed Aug 31 10:29:27 2005
***************
*** 32,37 ****
--- 32,40 ----
  (require 'reftex)
  ;;;
  
+ (defvar isearch-next-buffer-function)
+ (defvar TeX-master)
+ 
  (defun reftex-create-tags-file ()
    "Create TAGS file by running `etags' on the current document.
  The TAGS file is also immediately visited with `visit-tags-table'."
***************
*** 137,143 ****
      (set (make-local-variable 'TeX-master) master)
      (erase-buffer)
      (insert "                MULTIPLE LABELS IN CURRENT DOCUMENT:\n")
!     (insert 
       " Move point to label and type `r' to run a query-replace on the label\n"
       " and its references.  Type `q' to exit this buffer.\n\n")
      (insert " LABEL               FILE\n")
--- 140,146 ----
      (set (make-local-variable 'TeX-master) master)
      (erase-buffer)
      (insert "                MULTIPLE LABELS IN CURRENT DOCUMENT:\n")
!     (insert
       " Move point to label and type `r' to run a query-replace on the label\n"
       " and its references.  Type `q' to exit this buffer.\n\n")
      (insert " LABEL               FILE\n")
***************
*** 195,202 ****
             (not (yes-or-no-p "Replacing all simple labels in multiple files 
is risky.  Continue? ")))
        (error "Abort"))
    ;; Make the translation list
!   (let* ((re-core (concat "\\(" 
!                           (mapconcat 'cdr reftex-typekey-to-prefix-alist 
"\\|") 
                            "\\)"))
           (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'"))
           (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]"))
--- 198,205 ----
             (not (yes-or-no-p "Replacing all simple labels in multiple files 
is risky.  Continue? ")))
        (error "Abort"))
    ;; Make the translation list
!   (let* ((re-core (concat "\\("
!                           (mapconcat 'cdr reftex-typekey-to-prefix-alist 
"\\|")
                            "\\)"))
           (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'"))
           (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]"))
***************
*** 229,239 ****
      (reftex-save-all-document-buffers)
  
      ;; First test to check for erros
!     (setq n (reftex-translate 
               files search-re translate-alist error-fmt 'test))
  
      ;; Now the real thing.
!     (if (yes-or-no-p 
           (format "Replace %d items at %d places in %d files? "
                   (length translate-alist) n (length files)))
          (progn
--- 232,242 ----
      (reftex-save-all-document-buffers)
  
      ;; First test to check for erros
!     (setq n (reftex-translate
               files search-re translate-alist error-fmt 'test))
  
      ;; Now the real thing.
!     (if (yes-or-no-p
           (format "Replace %d items at %d places in %d files? "
                   (length translate-alist) n (length files)))
          (progn
***************
*** 251,259 ****
  
  (defun reftex-translate (files search-re translate-alist error-fmt test)
    ;; In FILES, look for SEARCH-RE and replace match 1 of it with
!   ;; its association in TRANSLATE-ALSIT.  
    ;; If we do not find an association and TEST is non-nil, query
!   ;; to ignore the problematic string.  
    ;; If TEST is nil, it is ignored without query.
    ;; Return the number of replacements.
    (let ((n 0) file label match-data buf macro pos cell)
--- 254,262 ----
  
  (defun reftex-translate (files search-re translate-alist error-fmt test)
    ;; In FILES, look for SEARCH-RE and replace match 1 of it with
!   ;; its association in TRANSLATE-ALSIT.
    ;; If we do not find an association and TEST is non-nil, query
!   ;; to ignore the problematic string.
    ;; If TEST is nil, it is ignored without query.
    ;; Return the number of replacements.
    (let ((n 0) file label match-data buf macro pos cell)
***************
*** 279,285 ****
                           (or (looking-at "\\\\ref")
                               (looking-at 
"\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]")
                               (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]")
!                              (looking-at (format 
                                            reftex-find-label-regexp-format
                                            (regexp-quote label)))))
                  ;; OK, we should replace it.
--- 282,288 ----
                           (or (looking-at "\\\\ref")
                               (looking-at 
"\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]")
                               (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]")
!                              (looking-at (format
                                            reftex-find-label-regexp-format
                                            (regexp-quote label)))))
                  ;; OK, we should replace it.
***************
*** 342,348 ****
  
  (defun reftex-isearch-wrap-function ()
    (if (not isearch-word)
!       (switch-to-buffer 
         (funcall isearch-next-buffer-function (current-buffer) t)))
    (goto-char (if isearch-forward (point-min) (point-max))))
  
--- 345,351 ----
  
  (defun reftex-isearch-wrap-function ()
    (if (not isearch-word)
!       (switch-to-buffer
         (funcall isearch-next-buffer-function (current-buffer) t)))
    (goto-char (if isearch-forward (point-min) (point-max))))
  
***************
*** 428,434 ****
  `reftex-isearch-minor-mode' on iff ARG is positive."
    (interactive "P")
    (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode))
!     (setq reftex-isearch-minor-mode 
          (not (or (and (null arg) reftex-isearch-minor-mode)
                   (<= (prefix-numeric-value arg) 0))))
      (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode)
--- 431,437 ----
  `reftex-isearch-minor-mode' on iff ARG is positive."
    (interactive "P")
    (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode))
!     (setq reftex-isearch-minor-mode
          (not (or (and (null arg) reftex-isearch-minor-mode)
                   (<= (prefix-numeric-value arg) 0))))
      (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode)
***************
*** 459,465 ****
      ;; Force modeline redisplay.
      (set-buffer-modified-p (buffer-modified-p))))
  
! (add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil 
                'reftex-isearch-minor-mode)
  
  ;;; arch-tag: 2dbf7633-92c8-4340-8656-7aa019d0f80d
--- 462,468 ----
      ;; Force modeline redisplay.
      (set-buffer-modified-p (buffer-modified-p))))
  
! (add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil
                'reftex-isearch-minor-mode)
  
  ;;; arch-tag: 2dbf7633-92c8-4340-8656-7aa019d0f80d