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

[Carsten Dominik]

Index: emacs/lisp/textmodes/reftex.el
diff -c emacs/lisp/textmodes/reftex.el:1.58 emacs/lisp/textmodes/reftex.el:1.59
*** emacs/lisp/textmodes/reftex.el:1.58 Fri Mar 25 10:08:35 2005
--- emacs/lisp/textmodes/reftex.el      Wed May 18 11:23:26 2005
***************
*** 3,9 ****
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Carsten Dominik <address@hidden>
! ;; Version: 4.26
  ;; Keywords: tex
  
  ;; This file is part of GNU Emacs.
--- 3,9 ----
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Carsten Dominik <address@hidden>
! ;; Version: 4.28
  ;; Keywords: tex
  
  ;; This file is part of GNU Emacs.
***************
*** 301,307 ****
  ;;; Define the formal stuff for a minor mode named RefTeX.
  ;;;
  
! (defconst reftex-version "RefTeX version 4.26"
    "Version string for RefTeX.")
  
  (defvar reftex-mode nil
--- 301,307 ----
  ;;; Define the formal stuff for a minor mode named RefTeX.
  ;;;
  
! (defconst reftex-version "RefTeX version 4.28"
    "Version string for RefTeX.")
  
  (defvar reftex-mode nil
***************
*** 1501,1507 ****
      (when (null (get pathvar 'status))
        ;; Get basic path
        (set pathvar
!            (reftex-uniq
              (reftex-parse-colon-path
               (mapconcat
                (lambda(x) 
--- 1501,1507 ----
      (when (null (get pathvar 'status))
        ;; Get basic path
        (set pathvar
!            (reftex-uniquify
              (reftex-parse-colon-path
               (mapconcat
                (lambda(x) 
***************
*** 1606,1620 ****
          (push dir path1)))
      path1))
  
- (defun reftex-uniq (list)
-   (let (new)
-     (while list
-       (or (member (car list) new)
-           (push (car list) new))
-       (pop list))
-     (nreverse new)))
- 
- 
  ;;; =========================================================================
  ;;;
  ;;; Parser functions
--- 1606,1611 ----
***************
*** 2145,2151 ****
      (nreverse rtn)))
  
  (defun reftex-uniquify (list)
!   ;; Return a list of all elements in LIST, but each only once
    (let (new elm)
      (while list
        (setq elm (pop list))
--- 2136,2142 ----
      (nreverse rtn)))
  
  (defun reftex-uniquify (list)
!   ;; Return a list of all elements in LIST, but each only once, keeping order
    (let (new elm)
      (while list
        (setq elm (pop list))
***************
*** 2342,2372 ****
              (if (find-face face) (throw 'exit face))
            (if (facep face) (throw 'exit face)))))))
  
! ;; Highlighting uses overlays.  For XEmacs, we need the emulation.
! (if (featurep 'xemacs) (require 'overlay))
  
  ;; We keep a vector with several different overlays to do our highlighting.
  (defvar reftex-highlight-overlays [nil nil nil])
  
  ;; Initialize the overlays
! (aset reftex-highlight-overlays 0 (make-overlay 1 1))
! (overlay-put (aref reftex-highlight-overlays 0) 
               'face 'highlight)
! (aset reftex-highlight-overlays 1 (make-overlay 1 1))
! (overlay-put (aref reftex-highlight-overlays 1)
               'face reftex-cursor-selected-face)
! (aset reftex-highlight-overlays 2 (make-overlay 1 1))
! (overlay-put (aref reftex-highlight-overlays 2)
               'face reftex-cursor-selected-face)
  
  ;; Two functions for activating and deactivation highlight overlays
  (defun reftex-highlight (index begin end &optional buffer)
    "Highlight a region with overlay INDEX."
!   (move-overlay (aref reftex-highlight-overlays index)
                  begin end (or buffer (current-buffer))))
  (defun reftex-unhighlight (index)
    "Detach overlay INDEX."
!   (delete-overlay (aref reftex-highlight-overlays index)))
  
  (defun reftex-highlight-shall-die ()
    ;; Function used in pre-command-hook to remove highlights.
--- 2333,2372 ----
              (if (find-face face) (throw 'exit face))
            (if (facep face) (throw 'exit face)))))))
  
! ;; Highlighting uses overlays.  For XEmacs, we use extends.
! (if (featurep 'xemacs)
!     (progn
!       (defalias 'reftex-make-overlay 'make-extent)
!       (defalias 'reftex-overlay-put 'set-extent-property)
!       (defalias 'reftex-move-overlay 'set-extent-endpoints)
!       (defalias 'reftex-delete-overlay 'detach-extent))
!   (defalias 'reftex-make-overlay 'make-overlay)
!   (defalias 'reftex-overlay-put 'overlay-put)
!   (defalias 'reftex-move-overlay 'move-overlay)
!   (defalias 'reftex-delete-overlay 'delete-overlay))
  
  ;; We keep a vector with several different overlays to do our highlighting.
  (defvar reftex-highlight-overlays [nil nil nil])
  
  ;; Initialize the overlays
! (aset reftex-highlight-overlays 0 (reftex-make-overlay 1 1))
! (reftex-overlay-put (aref reftex-highlight-overlays 0) 
               'face 'highlight)
! (aset reftex-highlight-overlays 1 (reftex-make-overlay 1 1))
! (reftex-overlay-put (aref reftex-highlight-overlays 1)
               'face reftex-cursor-selected-face)
! (aset reftex-highlight-overlays 2 (reftex-make-overlay 1 1))
! (reftex-overlay-put (aref reftex-highlight-overlays 2)
               'face reftex-cursor-selected-face)
  
  ;; Two functions for activating and deactivation highlight overlays
  (defun reftex-highlight (index begin end &optional buffer)
    "Highlight a region with overlay INDEX."
!   (reftex-move-overlay (aref reftex-highlight-overlays index)
                  begin end (or buffer (current-buffer))))
  (defun reftex-unhighlight (index)
    "Detach overlay INDEX."
!   (reftex-delete-overlay (aref reftex-highlight-overlays index)))
  
  (defun reftex-highlight-shall-die ()
    ;; Function used in pre-command-hook to remove highlights.