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

[Juanma Barranquero]

Index: emacs/lisp/textmodes/reftex-ref.el
diff -c emacs/lisp/textmodes/reftex-ref.el:1.13 
emacs/lisp/textmodes/reftex-ref.el:1.14
*** emacs/lisp/textmodes/reftex-ref.el:1.13     Tue Aug 27 05:54:41 2002
--- emacs/lisp/textmodes/reftex-ref.el  Tue Feb  4 08:30:45 2003
***************
*** 165,172 ****
                (string-match "^[ \t]*$" default))
            (setq default prefix
                  force-prompt t)       ; need to prompt
!         (setq default 
!               (concat prefix 
                        (funcall reftex-string-to-label-function default)))
  
          ;; Make it unique.
--- 165,172 ----
                (string-match "^[ \t]*$" default))
            (setq default prefix
                  force-prompt t)       ; need to prompt
!         (setq default
!               (concat prefix
                        (funcall reftex-string-to-label-function default)))
  
          ;; Make it unique.
***************
*** 212,218 ****
             ((setq entry (assoc label
                                 (symbol-value reftex-docstruct-symbol)))
              (ding)
!             (if (y-or-n-p 
                   (format "Label '%s' exists. Use anyway? " label))
                  (setq valid t)))
  
--- 212,218 ----
             ((setq entry (assoc label
                                 (symbol-value reftex-docstruct-symbol)))
              (ding)
!             (if (y-or-n-p
                   (format "Label '%s' exists. Use anyway? " label))
                  (setq valid t)))
  
***************
*** 222,230 ****
        (setq label default))
  
        ;; Insert the label into the label list
!       (let* ((here-I-am-info 
              (save-excursion
!               (if (and (or naked no-insert) 
                         (integerp (cdr macro-cell)))
                    (goto-char (cdr macro-cell)))
                (reftex-where-am-I)))
--- 222,230 ----
        (setq label default))
  
        ;; Insert the label into the label list
!       (let* ((here-I-am-info
              (save-excursion
!               (if (and (or naked no-insert)
                         (integerp (cdr macro-cell)))
                    (goto-char (cdr macro-cell)))
                (reftex-where-am-I)))
***************
*** 279,285 ****
    ;; Translate the upper 128 chars in the Latin-1 charset to ASCII equivalents
    (let ((tab "@@@@@@@@@@@@@@@@@@'@@@@@@@@@@@@@ 
icLxY|S\"ca<--R-o|23'uq..1o>423?AAAAAAACEEEEIIIIDNOOOOOXOUUUUYP3aaaaaaaceeeeiiiidnooooo:ouuuuypy")
        (emacsp (not (featurep 'xemacs))))
!     (mapconcat 
       (lambda (c)
         (cond ((and (> c 127) (< c 256))                 ; 8 bit Latin-1
              (char-to-string (aref tab (- c 128))))
--- 279,285 ----
    ;; Translate the upper 128 chars in the Latin-1 charset to ASCII equivalents
    (let ((tab "@@@@@@@@@@@@@@@@@@'@@@@@@@@@@@@@ 
icLxY|S\"ca<--R-o|23'uq..1o>423?AAAAAAACEEEEIIIIDNOOOOOXOUUUUYP3aaaaaaaceeeeiiiidnooooo:ouuuuypy")
        (emacsp (not (featurep 'xemacs))))
!     (mapconcat
       (lambda (c)
         (cond ((and (> c 127) (< c 256))                 ; 8 bit Latin-1
              (char-to-string (aref tab (- c 128))))
***************
*** 407,413 ****
              type (car type))
        (setq type (reftex-query-label-type))))
  
!   (let* ((refstyle 
          (cond ((reftex-typekey-check type reftex-vref-is-default) "\\vref")
                ((reftex-typekey-check type reftex-fref-is-default) "\\fref")
                (t "\\ref")))
--- 407,413 ----
              type (car type))
        (setq type (reftex-query-label-type))))
  
!   (let* ((refstyle
          (cond ((reftex-typekey-check type reftex-vref-is-default) "\\vref")
                ((reftex-typekey-check type reftex-fref-is-default) "\\fref")
                (t "\\ref")))
***************
*** 429,435 ****
      (setq type (nth 1 (car labels))
          form (or (cdr (assoc type reftex-typekey-to-format-alist))
                   form))
!     
      (cond
       (no-insert
        ;; Just return the first label
--- 429,435 ----
      (setq type (nth 1 (car labels))
          form (or (cdr (assoc type reftex-typekey-to-format-alist))
                   form))
! 
      (cond
       (no-insert
        ;; Just return the first label
***************
*** 443,449 ****
              sep (nth 2 (car labels))
              sep1 (cdr (assoc sep reftex-multiref-punctuation))
              labels (cdr labels))
!       (when cut 
          (backward-delete-char cut)
          (setq cut nil))
  
--- 443,449 ----
              sep (nth 2 (car labels))
              sep1 (cdr (assoc sep reftex-multiref-punctuation))
              labels (cdr labels))
!       (when cut
          (backward-delete-char cut)
          (setq cut nil))
  
***************
*** 478,484 ****
        matched cell)
      (save-excursion
        (while (and (setq cell (pop words))
!                 (not (setq matched 
                             (re-search-backward (car cell) bound t))))))
      (if matched
        (cons (cdr cell) (- (match-end 0) (match-end 1)))
--- 478,484 ----
        matched cell)
      (save-excursion
        (while (and (setq cell (pop words))
!                 (not (setq matched
                             (re-search-backward (car cell) bound t))))))
      (if matched
        (cons (cdr cell) (- (match-end 0) (match-end 1)))
***************
*** 543,551 ****
                                context
                                counter
                                commented
!                               (or here-I-am offset) 
                                prefix
!                               nil  ; no a toc buffer 
                                ))))
               (here-I-am
                (setq offset (reftex-get-offset buf here-I-am typekey)))
--- 543,551 ----
                                context
                                counter
                                commented
!                               (or here-I-am offset)
                                prefix
!                               nil  ; no a toc buffer
                                ))))
               (here-I-am
                (setq offset (reftex-get-offset buf here-I-am typekey)))
***************
*** 640,646 ****
        (save-excursion
        (while reftex-buffers-with-changed-invisibility
          (set-buffer (car (car reftex-buffers-with-changed-invisibility)))
!         (setq buffer-invisibility-spec 
                (cdr (pop reftex-buffers-with-changed-invisibility)))))
        (mapcar (lambda (buf) (and (buffer-live-p buf) (bury-buffer buf)))
              selection-buffers)
--- 640,646 ----
        (save-excursion
        (while reftex-buffers-with-changed-invisibility
          (set-buffer (car (car reftex-buffers-with-changed-invisibility)))
!         (setq buffer-invisibility-spec
                (cdr (pop reftex-buffers-with-changed-invisibility)))))
        (mapcar (lambda (buf) (and (buffer-live-p buf) (bury-buffer buf)))
              selection-buffers)
***************
*** 669,681 ****
  
  (defun reftex-query-label-type ()
    ;; Ask for label type
!   (let ((key (reftex-select-with-char 
              reftex-type-query-prompt reftex-type-query-help 3)))
      (unless (member (char-to-string key) reftex-typekey-list)
        (error "No such label type: %s" (char-to-string key)))
      (char-to-string key)))
  
! (defun reftex-show-label-location (data forward no-revisit 
                                        &optional stay error)
    ;; View the definition site of a label in another window.
    ;; DATA is an entry from the docstruct list.
--- 669,681 ----
  
  (defun reftex-query-label-type ()
    ;; Ask for label type
!   (let ((key (reftex-select-with-char
              reftex-type-query-prompt reftex-type-query-help 3)))
      (unless (member (char-to-string key) reftex-typekey-list)
        (error "No such label type: %s" (char-to-string key)))
      (char-to-string key)))
  
! (defun reftex-show-label-location (data forward no-revisit
                                        &optional stay error)
    ;; View the definition site of a label in another window.
    ;; DATA is an entry from the docstruct list.
***************
*** 697,703 ****
        (throw 'exit nil))
  
        ;; Goto the file in another window
!       (setq buffer 
            (if no-revisit
                (reftex-get-buffer-visiting file)
              (reftex-get-file-buffer-force
--- 697,703 ----
        (throw 'exit nil))
  
        ;; Goto the file in another window
!       (setq buffer
            (if no-revisit
                (reftex-get-buffer-visiting file)
              (reftex-get-file-buffer-force
***************
*** 763,769 ****
            (when (or (not (eq major-mode 'latex-mode))
                      (not font-lock-mode))
              (latex-mode)
!             (run-hook-with-args 
               'reftex-pre-refontification-functions
               reftex-call-back-to-this-buffer 'reftex-hidden)
              (turn-on-font-lock))
--- 763,769 ----
            (when (or (not (eq major-mode 'latex-mode))
                      (not font-lock-mode))
              (latex-mode)
!             (run-hook-with-args
               'reftex-pre-refontification-functions
               reftex-call-back-to-this-buffer 'reftex-hidden)
              (turn-on-font-lock))
***************
*** 829,835 ****
      (unless other-window
        (set-window-configuration wcfg)
        (switch-to-buffer (marker-buffer where))
!       (goto-char where))      
      (reftex-unhighlight 0)))
  
  
--- 829,835 ----
      (unless other-window
        (set-window-configuration wcfg)
        (switch-to-buffer (marker-buffer where))
!       (goto-char where))
      (reftex-unhighlight 0)))