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

[Carsten Dominik]

Index: emacs/lisp/textmodes/reftex-sel.el
diff -c emacs/lisp/textmodes/reftex-sel.el:1.18 
emacs/lisp/textmodes/reftex-sel.el:1.19
*** emacs/lisp/textmodes/reftex-sel.el:1.18     Fri Jan 14 10:12:03 2005
--- emacs/lisp/textmodes/reftex-sel.el  Wed May 18 11:23:26 2005
***************
*** 1,8 ****
  ;;; reftex-sel.el --- the selection modes for RefTeX
! ;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004 Free Software Foundation, 
Inc.
  
  ;; Author: Carsten Dominik <address@hidden>
! ;; Version: 4.26
  
  ;; This file is part of GNU Emacs.
  
--- 1,9 ----
  ;;; reftex-sel.el --- the selection modes for RefTeX
! ;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2440, 2005
! ;;  Free Software Foundation, Inc.
  
  ;; Author: Carsten Dominik <address@hidden>
! ;; Version: 4.28
  
  ;; This file is part of GNU Emacs.
  
***************
*** 418,424 ****
            (remove-hook 'post-command-hook 
                         'reftex-select-post-command-hook t))
          ;; Kill the mark overlays
!         (mapcar (lambda (c) (delete-overlay (nth 1 c)))
                  reftex-select-marked)))))
  
      (set (make-local-variable 'reftex-last-line)
--- 419,425 ----
            (remove-hook 'post-command-hook 
                         'reftex-select-post-command-hook t))
          ;; Kill the mark overlays
!         (mapcar (lambda (c) (reftex-delete-overlay (nth 1 c)))
                  reftex-select-marked)))))
  
      (set (make-local-variable 'reftex-last-line)
***************
*** 604,617 ****
      (setq boe (or (previous-single-property-change (1+ (point)) :data)
                    (point-min))
            eoe (or (next-single-property-change (point) :data) (point-max)))
!     (setq ovl (make-overlay boe eoe))
      (push (list data ovl separator) reftex-select-marked)
!     (overlay-put ovl 'face reftex-select-mark-face)
!     (overlay-put ovl 'before-string
!                  (if separator
!                      (format "*%c%d* " separator
!                              (length reftex-select-marked))
!                    (format "*%d*  " (length reftex-select-marked))))
      (message "Entry has mark no. %d" (length reftex-select-marked))))
  
  (defun reftex-select-mark-comma ()
--- 605,618 ----
      (setq boe (or (previous-single-property-change (1+ (point)) :data)
                    (point-min))
            eoe (or (next-single-property-change (point) :data) (point-max)))
!     (setq ovl (reftex-make-overlay boe eoe))
      (push (list data ovl separator) reftex-select-marked)
!     (reftex-overlay-put ovl 'face reftex-select-mark-face)
!     (reftex-overlay-put ovl 'before-string
!                         (if separator
!                             (format "*%c%d* " separator
!                                     (length reftex-select-marked))
!                           (format "*%d*  " (length reftex-select-marked))))
      (message "Entry has mark no. %d" (length reftex-select-marked))))
  
  (defun reftex-select-mark-comma ()
***************
*** 637,655 ****
           sep)
      (unless cell
        (error "No marked entry at point"))
!     (and ovl (delete-overlay ovl))
      (setq reftex-select-marked (delq cell reftex-select-marked))
!     (if (featurep 'xemacs)
!         ;; before-string property is broken in Emacs
!         (progn
!           (setq cnt (1+ (length reftex-select-marked)))
!           (mapcar (lambda (c)
!                     (setq sep (nth 2 c))
!                     (overlay-put (nth 1 c) 'before-string
!                                  (if sep
!                                      (format "*%c%d* " sep (decf cnt))
!                                    (format "*%d*  " (decf cnt)))))
!                   reftex-select-marked)))
      (message "Entry no longer marked")))
  
  (defun reftex-select-help ()
--- 638,653 ----
           sep)
      (unless cell
        (error "No marked entry at point"))
!     (and ovl (reftex-delete-overlay ovl))
      (setq reftex-select-marked (delq cell reftex-select-marked))
!     (setq cnt (1+ (length reftex-select-marked)))
!     (mapcar (lambda (c)
!               (setq sep (nth 2 c))
!               (reftex-overlay-put (nth 1 c) 'before-string
!                                   (if sep
!                                       (format "*%c%d* " sep (decf cnt))
!                                     (format "*%d*  " (decf cnt)))))
!             reftex-select-marked)
      (message "Entry no longer marked")))
  
  (defun reftex-select-help ()