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

[Miles Bader]

Index: emacs/lisp/textmodes/reftex-toc.el
diff -c emacs/lisp/textmodes/reftex-toc.el:1.15 
emacs/lisp/textmodes/reftex-toc.el:1.16
*** emacs/lisp/textmodes/reftex-toc.el:1.15     Tue Aug 27 05:54:41 2002
--- emacs/lisp/textmodes/reftex-toc.el  Tue Feb  4 08:30:45 2003
***************
*** 191,201 ****
             reftex-toc-include-context
             nil ; counter
             nil ; commented
!            here-I-am 
             ""     ; xr-prefix
             t      ; a toc buffer
             ))
!        
        (run-hooks 'reftex-display-copied-context-hook)
        (message "Building *toc* buffer...done.")
        (setq buffer-read-only t))
--- 191,201 ----
             reftex-toc-include-context
             nil ; counter
             nil ; commented
!            here-I-am
             ""     ; xr-prefix
             t      ; a toc buffer
             ))
! 
        (run-hooks 'reftex-display-copied-context-hook)
        (message "Building *toc* buffer...done.")
        (setq buffer-read-only t))
***************
*** 207,213 ****
                                   t
                                   reftex-toc-include-index-entries
                                   reftex-toc-include-file-boundaries)
!               (reftex-last-assoc-before-elt 
                 'toc here-I-am
                 (symbol-value reftex-docstruct-symbol))))
        (put 'reftex-toc :reftex-line 3)
--- 207,213 ----
                                   t
                                   reftex-toc-include-index-entries
                                   reftex-toc-include-file-boundaries)
!               (reftex-last-assoc-before-elt
                 'toc here-I-am
                 (symbol-value reftex-docstruct-symbol))))
        (put 'reftex-toc :reftex-line 3)
***************
*** 231,237 ****
         (not (get-text-property (point) 'intangible))
         (memq reftex-highlight-selection '(cursor both))
         (reftex-highlight 2
!          (or (previous-single-property-change 
                (min (point-max) (1+ (point))) :data)
               (point-min))
           (or (next-single-property-change (point) :data)
--- 231,237 ----
         (not (get-text-property (point) 'intangible))
         (memq reftex-highlight-selection '(cursor both))
         (reftex-highlight 2
!          (or (previous-single-property-change
                (min (point-max) (1+ (point))) :data)
               (point-min))
           (or (next-single-property-change (point) :data)
***************
*** 292,298 ****
    (interactive "p")
    (setq reftex-callback-fwd t)
    (or (eobp) (forward-char 1))
!   (goto-char (or (next-single-property-change (point) :data) 
                 (point))))
  (defun reftex-toc-previous (&optional arg)
    "Move to previous selectable item."
--- 292,298 ----
    (interactive "p")
    (setq reftex-callback-fwd t)
    (or (eobp) (forward-char 1))
!   (goto-char (or (next-single-property-change (point) :data)
                 (point))))
  (defun reftex-toc-previous (&optional arg)
    "Move to previous selectable item."
***************
*** 326,332 ****
  With prefix ARG, prompt for a label type and include only labels of
  that specific type."
    (interactive "P")
!   (setq reftex-toc-include-labels 
        (if arg (reftex-query-label-type)
          (not reftex-toc-include-labels)))
    (reftex-toc-revert))
--- 326,332 ----
  With prefix ARG, prompt for a label type and include only labels of
  that specific type."
    (interactive "P")
!   (setq reftex-toc-include-labels
        (if arg (reftex-query-label-type)
          (not reftex-toc-include-labels)))
    (reftex-toc-revert))
***************
*** 416,422 ****
  (defun reftex-toc-rescan (&rest ignore)
    "Regenerate the *toc* buffer by reparsing file of section at point."
    (interactive)
!   (if (and reftex-enable-partial-scans 
           (null current-prefix-arg))
        (let* ((data (get-text-property (point) :data))
             (what (car data))
--- 416,422 ----
  (defun reftex-toc-rescan (&rest ignore)
    "Regenerate the *toc* buffer by reparsing file of section at point."
    (interactive)
!   (if (and reftex-enable-partial-scans
           (null current-prefix-arg))
        (let* ((data (get-text-property (point) :data))
             (what (car data))
***************
*** 494,502 ****
           show-window show-buffer match)
  
      (unless toc (error "Don't know which toc line to visit"))
!     
      (cond
!   
       ((eq (car toc) 'toc)
        ;; a toc entry
        (setq match (reftex-toc-find-section toc no-revisit)))
--- 494,502 ----
           show-window show-buffer match)
  
      (unless toc (error "Don't know which toc line to visit"))
! 
      (cond
! 
       ((eq (car toc) 'toc)
        ;; a toc entry
        (setq match (reftex-toc-find-section toc no-revisit)))
***************
*** 512,518 ****
                  (file (nth 1 toc)))
              (if (or (not no-revisit) (reftex-get-buffer-visiting file))
                  (progn
!                   (switch-to-buffer-other-window 
                     (reftex-get-file-buffer-force file nil))
                    (goto-char (if (eq where 'bof) (point-min) (point-max))))
                (message reftex-no-follow-message) nil))))
--- 512,518 ----
                  (file (nth 1 toc)))
              (if (or (not no-revisit) (reftex-get-buffer-visiting file))
                  (progn
!                   (switch-to-buffer-other-window
                     (reftex-get-file-buffer-force file nil))
                    (goto-char (if (eq where 'bof) (point-min) (point-max))))
                (message reftex-no-follow-message) nil))))
***************
*** 560,567 ****
                (looking-at (reftex-make-desperate-section-regexp literal))
                (looking-at (concat "\\\\"
                                    (regexp-quote
!                                    (car 
!                                     (rassq level 
                                             reftex-section-levels-all)))
                                    "[[{]?"))))
           ((or (not no-revisit)
--- 560,567 ----
                (looking-at (reftex-make-desperate-section-regexp literal))
                (looking-at (concat "\\\\"
                                    (regexp-quote
!                                    (car
!                                     (rassq level
                                             reftex-section-levels-all)))
                                    "[[{]?"))))
           ((or (not no-revisit)
***************
*** 672,678 ****
        (define-key reftex-toc-map (vector (list key)) 'digit-argument))
  (define-key reftex-toc-map "-" 'negative-argument)
  
! (easy-menu-define 
   reftex-toc-menu reftex-toc-map
   "Menu for Table of Contents buffer"
   '("TOC"
--- 672,678 ----
        (define-key reftex-toc-map (vector (list key)) 'digit-argument))
  (define-key reftex-toc-map "-" 'negative-argument)
  
! (easy-menu-define
   reftex-toc-menu reftex-toc-map
   "Menu for Table of Contents buffer"
   '("TOC"
***************
*** 699,705 ****
      ["Context" reftex-toc-toggle-context :style toggle
       :selected reftex-toc-include-context]
      "--"
!     ["Follow Mode" reftex-toc-toggle-follow :style toggle 
       :selected reftex-toc-follow-mode])
     "--"
     ["Help" reftex-toc-show-help t]))
--- 699,705 ----
      ["Context" reftex-toc-toggle-context :style toggle
       :selected reftex-toc-include-context]
      "--"
!     ["Follow Mode" reftex-toc-toggle-follow :style toggle
       :selected reftex-toc-follow-mode])
     "--"
     ["Help" reftex-toc-show-help t]))