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

[Werner LEMBERG]

Index: emacs/lisp/textmodes/reftex.el
diff -c emacs/lisp/textmodes/reftex.el:1.56 emacs/lisp/textmodes/reftex.el:1.57
*** emacs/lisp/textmodes/reftex.el:1.56 Tue Feb  1 12:39:39 2005
--- emacs/lisp/textmodes/reftex.el      Fri Mar 25 09:03:24 2005
***************
*** 1,5 ****
  ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX
! ;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004 Free Software Foundation, 
Inc.
  
  ;; Author: Carsten Dominik <address@hidden>
  ;; Version: 4.26
--- 1,6 ----
  ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX
! ;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
! ;;  Free Software Foundation, Inc.
  
  ;; Author: Carsten Dominik <address@hidden>
  ;; Version: 4.26
***************
*** 1416,1422 ****
             ((= key ?\C-i)
              (setq prefix (completing-read "Prefix: " xr-alist nil t))
              (- len (length (memq (assoc prefix xr-alist) xr-alist))))
!            (t (error "Illegal document selection [%c]" key)))))))))
  
  ;;; =========================================================================
  ;;;
--- 1417,1423 ----
             ((= key ?\C-i)
              (setq prefix (completing-read "Prefix: " xr-alist nil t))
              (- len (length (memq (assoc prefix xr-alist) xr-alist))))
!            (t (error "Invalid document selection [%c]" key)))))))))
  
  ;;; =========================================================================
  ;;;
***************
*** 2167,2183 ****
    (reftex-convert-string string "[-~ \t\n\r,;]" nil t t
                           5 40 nil 1 " " (nth 5 
reftex-derive-label-parameters)))
  
! (defun reftex-convert-string (string split-re illegal-re dot keep-fp
!                                      nwords maxchar illegal abbrev sep
                                       ignore-words &optional downcase)
    "Convert a string (a sentence) to something shorter.
  SPLIT-RE     is the regular expression used to split the string into words.
! ILLEGAL-RE   matches characters which are illegal in the final string.
  DOT          t means add dots to abbreviated words.
  KEEP-FP      t means to keep a final punctuation when applicable.
  NWORDS       Number of words to use.
  MAXCHAR      Maximum number of characters in the final string.
! ILLEGAL      nil: Throw away any words containing stuff matched with 
ILLEGAL-RE.
               t:   Throw away only the matched part, not the whole word.
  ABBREV       nil: Never abbreviate words.
               t:   Always abbreviate words (see `reftex-abbrev-parameters').
--- 2168,2184 ----
    (reftex-convert-string string "[-~ \t\n\r,;]" nil t t
                           5 40 nil 1 " " (nth 5 
reftex-derive-label-parameters)))
  
! (defun reftex-convert-string (string split-re invalid-re dot keep-fp
!                                      nwords maxchar invalid abbrev sep
                                       ignore-words &optional downcase)
    "Convert a string (a sentence) to something shorter.
  SPLIT-RE     is the regular expression used to split the string into words.
! INVALID-RE   matches characters which are invalid in the final string.
  DOT          t means add dots to abbreviated words.
  KEEP-FP      t means to keep a final punctuation when applicable.
  NWORDS       Number of words to use.
  MAXCHAR      Maximum number of characters in the final string.
! INVALID      nil: Throw away any words containing stuff matched with 
INVALID-RE.
               t:   Throw away only the matched part, not the whole word.
  ABBREV       nil: Never abbreviate words.
               t:   Always abbreviate words (see `reftex-abbrev-parameters').
***************
*** 2187,2193 ****
  IGNORE-WORDS List of words which should be removed from the string."
  
    (let* ((words0 (split-string string (or split-re "[ \t\n\r]")))
!          (reftex-label-illegal-re (or illegal-re "\000"))
           (abbrev-re (concat
                       "\\`\\("
                       (make-string (nth 0 reftex-abbrev-parameters) ?.)
--- 2188,2194 ----
  IGNORE-WORDS List of words which should be removed from the string."
  
    (let* ((words0 (split-string string (or split-re "[ \t\n\r]")))
!          (reftex-label-illegal-re (or invalid-re "\000"))
           (abbrev-re (concat
                       "\\`\\("
                       (make-string (nth 0 reftex-abbrev-parameters) ?.)
***************
*** 2203,2209 ****
        (cond
         ((member (downcase word) ignore-words))
         ((string-match reftex-label-illegal-re word)
!         (when illegal
            (while (string-match reftex-label-illegal-re word)
              (setq word (replace-match "" nil nil word)))
            (push word words)))
--- 2204,2210 ----
        (cond
         ((member (downcase word) ignore-words))
         ((string-match reftex-label-illegal-re word)
!         (when invalid
            (while (string-match reftex-label-illegal-re word)
              (setq word (replace-match "" nil nil word)))
            (push word words)))