diff options
Diffstat (limited to 'lisp/textmodes/reftex-index.el')
| -rw-r--r-- | lisp/textmodes/reftex-index.el | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index f0ceaa74d26..5b884dd8480 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1,11 +1,9 @@ ;;; reftex-index.el --- index support with RefTeX -;; Copyright (C) 1997-2011 Free Software Foundation, Inc. +;; Copyright (C) 1997-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl> ;; Maintainer: auctex-devel@gnu.org -;; Version: 4.31 -;; Package: reftex ;; This file is part of GNU Emacs. @@ -27,9 +25,9 @@ ;;; Code: (eval-when-compile (require 'cl)) -(provide 'reftex-index) +(declare-function texmathp "ext:texmathp" ()) + (require 'reftex) -;;; ;; START remove for XEmacs release (defvar mark-active) @@ -37,8 +35,6 @@ (defvar TeX-master) ;; END remove for XEmacs release -(declare-function texmathp "ext:texmathp" ()) - (defun reftex-index-selection-or-word (&optional arg phrase) "Put selection or the word near point into the default index macro. This uses the information in `reftex-index-default-macro' to make an index @@ -52,9 +48,7 @@ which is part of AUCTeX, the string is first processed with the (interactive "P") (let* ((use-default (not (equal arg '(16)))) ; check for double prefix ;; check if we have an active selection - (active (if (featurep 'xemacs) - (and zmacs-regions (region-exists-p)) ; XEmacs - (and transient-mark-mode mark-active))) ; Emacs + (active (reftex-region-active-p)) (beg (if active (region-beginning) (save-excursion @@ -274,6 +268,8 @@ will prompt for other arguments." (and newtag (cdr cell) (not (member newtag (cdr cell))) (push newtag (cdr cell))))) +(define-obsolete-variable-alias + 'reftex-index-map 'reftex-index-mode-map "24.1") (defvar reftex-index-mode-map (let ((map (make-sparse-keymap))) ;; Index map @@ -377,8 +373,6 @@ will prompt for other arguments." map) "Keymap used for *Index* buffers.") -(define-obsolete-variable-alias - 'reftex-index-map 'reftex-index-mode-map "24.1") (defvar reftex-index-menu) @@ -585,9 +579,7 @@ SPC=view TAB=goto RET=goto+hide [e]dit [q]uit [r]escan [f]ollow [?]Help (if (memq reftex-highlight-selection '(mouse both)) reftex-mouse-selected-face nil)) - (index-face (reftex-verified-face reftex-label-face - 'font-lock-constant-face - 'font-lock-reference-face)) + (index-face reftex-label-face) sublist cell from to first-char) ;; Make the sublist and sort it @@ -1179,6 +1171,8 @@ This gets refreshed in every phrases command.") "Font lock keywords for reftex-index-phrases-mode.") (defvar reftex-index-phrases-font-lock-defaults nil "Font lock defaults for reftex-index-phrases-mode.") +(define-obsolete-variable-alias + 'reftex-index-phrases-map 'reftex-index-phrases-mode-map "24.1") (defvar reftex-index-phrases-mode-map (let ((map (make-sparse-keymap))) ;; Keybindings and Menu for phrases buffer @@ -1244,9 +1238,11 @@ This gets refreshed in every phrases command.") map) "Keymap used for *toc* buffer.") -(define-obsolete-variable-alias - 'reftex-index-phrases-map 'reftex-index-phrases-mode-map "24.1") - +(defvar reftex-index-phrases-syntax-table + (let ((table (make-syntax-table))) + (modify-syntax-entry ?\" "." table) + table) + "Syntax table for RefTeX Index Phrases mode.") (defun reftex-index-phrase-selection-or-word (arg) "Add current selection or word at point to the phrases buffer. @@ -1266,6 +1262,7 @@ You get a chance to edit the entry in the phrases buffer - finish with "Switch to the phrases buffer, initialize if empty." (interactive) (reftex-access-scan-info) + (set-marker reftex-index-return-marker (point)) (let* ((master (reftex-TeX-master-file)) (name (concat (file-name-sans-extension master) reftex-index-phrase-file-extension))) @@ -1373,6 +1370,7 @@ For more information see the RefTeX User Manual. Here are all local bindings. \\{reftex-index-phrases-mode-map}" + :syntax-table reftex-index-phrases-syntax-table (set (make-local-variable 'font-lock-defaults) reftex-index-phrases-font-lock-defaults) (easy-menu-add reftex-index-phrases-menu reftex-index-phrases-mode-map) @@ -2095,5 +2093,6 @@ Does not do a save-excursion." reftex-index-phrases-macro-data "\n")))) (reftex-select-with-char prompt help delay))) +(provide 'reftex-index) ;;; reftex-index.el ends here |