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

[Miles Bader]

Index: emacs/lisp/textmodes/reftex-sel.el
diff -c emacs/lisp/textmodes/reftex-sel.el:1.14 
emacs/lisp/textmodes/reftex-sel.el:1.15
*** emacs/lisp/textmodes/reftex-sel.el:1.14     Tue Aug 27 05:54:41 2002
--- emacs/lisp/textmodes/reftex-sel.el  Tue Feb  4 08:30:45 2003
***************
*** 38,44 ****
  (defun reftex-select-label-mode ()
    "Major mode for selecting a label in a LaTeX document.
  This buffer was created with RefTeX.
! It only has a meaningful keymap when you are in the middle of a 
  selection process.
  To select a label, move the cursor to it and press RET.
  Press `?' for a summary of important key bindings.
--- 38,44 ----
  (defun reftex-select-label-mode ()
    "Major mode for selecting a label in a LaTeX document.
  This buffer was created with RefTeX.
! It only has a meaningful keymap when you are in the middle of a
  selection process.
  To select a label, move the cursor to it and press RET.
  Press `?' for a summary of important key bindings.
***************
*** 69,75 ****
  (defun reftex-select-bib-mode ()
    "Major mode for selecting a citation key in a LaTeX document.
  This buffer was created with RefTeX.
! It only has a meaningful keymap when you are in the middle of a 
  selection process.
  In order to select a citation, move the cursor to it and press RET.
  Press `?' for a summary of important key bindings.
--- 69,75 ----
  (defun reftex-select-bib-mode ()
    "Major mode for selecting a citation key in a LaTeX document.
  This buffer was created with RefTeX.
! It only has a meaningful keymap when you are in the middle of a
  selection process.
  In order to select a citation, move the cursor to it and press RET.
  Press `?' for a summary of important key bindings.
***************
*** 262,268 ****
                note    (nth 5 cell))
  
          (when (and labels
!                  (or (eq labels t) 
                       (string= typekey labels)
                       (string= labels " "))
                     (or show-commented (null comment)))
--- 262,268 ----
                note    (nth 5 cell))
  
          (when (and labels
!                  (or (eq labels t)
                       (string= typekey labels)
                       (string= labels " "))
                     (or show-commented (null comment)))
***************
*** 296,302 ****
            (put-text-property from to :data cell)
          (when mouse-face
            (put-text-property from (1- to)
!                              'mouse-face mouse-face))   
            (goto-char to)))
  
         ((eq (car cell) 'index)
--- 296,302 ----
            (put-text-property from to :data cell)
          (when mouse-face
            (put-text-property from (1- to)
!                              'mouse-face mouse-face))
            (goto-char to)))
  
         ((eq (car cell) 'index)
***************
*** 314,320 ****
  
          (when font
            (setq to (point))
!           (put-text-property 
             (- (point) (length (nth 7 cell))) to
             'face index-face)
            (goto-char to))
--- 314,320 ----
  
          (when font
            (setq to (point))
!           (put-text-property
             (- (point) (length (nth 7 cell))) to
             'face index-face)
            (goto-char to))
***************
*** 327,336 ****
          (put-text-property from to :data cell)
          (when mouse-face
            (put-text-property from (1- to)
!                              'mouse-face mouse-face))   
            (goto-char to))))
  
!       (if (eq cell here-I-am) 
          (setq offset 'attention))
        (if (and prev-inserted (eq offset 'attention))
          (setq offset prev-inserted))
--- 327,336 ----
          (put-text-property from to :data cell)
          (when mouse-face
            (put-text-property from (1- to)
!                              'mouse-face mouse-face))
            (goto-char to))))
  
!       (if (eq cell here-I-am)
          (setq offset 'attention))
        (if (and prev-inserted (eq offset 'attention))
          (setq offset prev-inserted))
***************
*** 357,363 ****
         ((listp loc)
          (setq pos (text-property-any (point-min) (point-max) :data loc))
          (when pos
!           (goto-char pos) 
            (throw 'exit t)))
         ((integerp loc)
          (when (<= loc (count-lines (point-min) (point-max)))
--- 357,363 ----
         ((listp loc)
          (setq pos (text-property-any (point-min) (point-max) :data loc))
          (when pos
!           (goto-char pos)
            (throw 'exit t)))
         ((integerp loc)
          (when (<= loc (count-lines (point-min) (point-max)))
***************
*** 394,400 ****
                (setq truncate-lines t)
  
              ;; Find a good starting point
!             (reftex-find-start-point 
               (point-min) offset reftex-last-data reftex-last-line)
                (beginning-of-line 1)
              (set (make-local-variable 'reftex-last-follow-point) (point))
--- 394,400 ----
                (setq truncate-lines t)
  
              ;; Find a good starting point
!             (reftex-find-start-point
               (point-min) offset reftex-last-data reftex-last-line)
                (beginning-of-line 1)
              (set (make-local-variable 'reftex-last-follow-point) (point))
***************
*** 415,421 ****
          (set-buffer selection-buffer)
          (use-local-map nil)
          (remove-hook 'pre-command-hook 'reftex-select-pre-command-hook t)
!         (remove-hook 'post-command-hook 
                       'reftex-select-post-command-hook t))
        ;; Kill the mark overlays
        (mapcar (lambda (c) (delete-overlay (nth 1 c)))
--- 415,421 ----
          (set-buffer selection-buffer)
          (use-local-map nil)
          (remove-hook 'pre-command-hook 'reftex-select-pre-command-hook t)
!         (remove-hook 'post-command-hook
                       'reftex-select-post-command-hook t))
        ;; Kill the mark overlays
        (mapcar (lambda (c) (delete-overlay (nth 1 c)))
***************
*** 451,461 ****
    (let (b e)
      (setq data (get-text-property (point) :data))
      (setq last-data (or data last-data))
!   
      (when (and data cb-flag
               (not (equal reftex-last-follow-point (point))))
        (setq reftex-last-follow-point (point))
!       (funcall call-back data reftex-callback-fwd 
               (not reftex-revisit-to-follow)))
      (if data
        (setq b (or (previous-single-property-change
--- 451,461 ----
    (let (b e)
      (setq data (get-text-property (point) :data))
      (setq last-data (or data last-data))
! 
      (when (and data cb-flag
               (not (equal reftex-last-follow-point (point))))
        (setq reftex-last-follow-point (point))
!       (funcall call-back data reftex-callback-fwd
               (not reftex-revisit-to-follow)))
      (if data
        (setq b (or (previous-single-property-change
***************
*** 575,581 ****
  (defun reftex-select-read-label ()
    "Use minibuffer to read a label to reference, with completion."
    (interactive)
!   (let ((label (completing-read 
                "Label: " (symbol-value reftex-docstruct-symbol)
                nil nil reftex-prefix)))
      (unless (or (equal label "") (equal label reftex-prefix))
--- 575,581 ----
  (defun reftex-select-read-label ()
    "Use minibuffer to read a label to reference, with completion."
    (interactive)
!   (let ((label (completing-read
                "Label: " (symbol-value reftex-docstruct-symbol)
                nil nil reftex-prefix)))
      (unless (or (equal label "") (equal label reftex-prefix))
***************
*** 680,686 ****
          ([(up)]     . reftex-select-previous)
          ("f"        . reftex-select-toggle-follow)
          ("\C-m"     . reftex-select-accept)
!         ([(return)] . reftex-select-accept) 
          ("q"        . reftex-select-quit)
          ("."        . reftex-select-show-insertion-point)
          ("?"        . reftex-select-help))
--- 680,686 ----
          ([(up)]     . reftex-select-previous)
          ("f"        . reftex-select-toggle-follow)
          ("\C-m"     . reftex-select-accept)
!         ([(return)] . reftex-select-accept)
          ("q"        . reftex-select-quit)
          ("."        . reftex-select-show-insertion-point)
          ("?"        . reftex-select-help))
***************
*** 703,709 ****
  ;; Specific bindings in reftex-select-label-map
  (loop for key across "aAcgFlrRstx#%" do
        (define-key reftex-select-label-map (vector (list key))
!       (list 'lambda '() 
              "Press `?' during selection to find out about this key."
              '(interactive) (list 'throw '(quote myexit) key))))
  
--- 703,709 ----
  ;; Specific bindings in reftex-select-label-map
  (loop for key across "aAcgFlrRstx#%" do
        (define-key reftex-select-label-map (vector (list key))
!       (list 'lambda '()
              "Press `?' during selection to find out about this key."
              '(interactive) (list 'throw '(quote myexit) key))))
  
***************
*** 727,733 ****
  ;; Specific bindings in reftex-select-bib-map
  (loop for key across "grRaA" do
        (define-key reftex-select-bib-map (vector (list key))
!       (list 'lambda '() 
              "Press `?' during selection to find out about this key."
              '(interactive) (list 'throw '(quote myexit) key))))
  
--- 727,733 ----
  ;; Specific bindings in reftex-select-bib-map
  (loop for key across "grRaA" do
        (define-key reftex-select-bib-map (vector (list key))
!       (list 'lambda '()
              "Press `?' during selection to find out about this key."
              '(interactive) (list 'throw '(quote myexit) key))))
  
***************
*** 737,742 ****
        ("m"     . reftex-select-mark)
        ("u"     . reftex-select-unmark))
        do (define-key reftex-select-bib-map (car x) (cdr x)))
!   
  
  ;;; reftex-sel.el ends here
--- 737,742 ----
        ("m"     . reftex-select-mark)
        ("u"     . reftex-select-unmark))
        do (define-key reftex-select-bib-map (car x) (cdr x)))
! 
  
  ;;; reftex-sel.el ends here