diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 27 | ||||
| -rw-r--r-- | lisp/ediff-vers.el | 103 | ||||
| -rw-r--r-- | lisp/ediff.el | 14 | ||||
| -rw-r--r-- | lisp/emulation/vip.el | 16 | ||||
| -rw-r--r-- | lisp/iimage.el | 6 | ||||
| -rw-r--r-- | lisp/mail/mailabbrev.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/mixal-mode.el | 12 | ||||
| -rw-r--r-- | lisp/progmodes/simula.el | 8 | ||||
| -rw-r--r-- | lisp/textmodes/reftex.el | 344 |
9 files changed, 220 insertions, 312 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 32d4ad8ae6a..ff36e73b6ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,30 @@ +2007-10-31 Dan Nicolaescu <dann@ics.uci.edu> + + * progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm + only if it is bound. + + * textmodes/reftex.el: Move autoloads for before all uses. + (reftex-make-overlay, reftex-overlay-put, reftex-move-overlay) + (reftex-delete-overlay): Move to the top level with the condition + in the body. + + * progmodes/simula.el: Use when instead of if. + + * iimage.el (iimage-locate-file): Define unconditionally. + + * mail/mailabbrev.el (mail-abbrev-next-line): + * emulation/vip.el (vip-enlarge-region, vip-line) + (vip-next-line-at-bol, vip-previous-line) + (vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read): + Wrap with-no-warnings around uses of next-line and previous-line. + + * ediff.el (run-ediff-from-cvs-buffer): + * ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove + function not used by pcl-cvs anymore. + (noninteractive, generic-sc-get-latest-rev) + (ediff-generic-sc-internal, ediff-generic-sc-merge-internal): + Delete support for long obsolete generic-sc.el. + 2007-10-31 Glenn Morris <rgm@gnu.org> * cvs-status.el: No longer require pcvs when compiling. diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 8480984b95c..98c1defc212 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -39,13 +39,6 @@ (let ((load-path (cons (expand-file-name ".") load-path))) (load "pcl-cvs" 'noerror) (load "rcs" 'noerror) - ;; On 8+3 MS-DOS filesystems, generic-x.el is loaded - ;; instead of (the missing) generic-sc.el. Since the - ;; version of Emacs which supports MS-DOS doesn't have - ;; generic-sc, we simply avoid loading it. - (or (and (fboundp 'msdos-long-file-names) - (not (msdos-long-file-names))) - (load "generic-sc" 'noerror)) ;; (load "vc" 'noerror) ; this sometimes causes compiler error (or (featurep 'ediff-init) (load "ediff-init.el" nil nil 'nosuffix)) @@ -157,32 +150,6 @@ comparison or merge operations are being performed." (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision) )) - -;; GENERIC-SC.el support - -(defun generic-sc-get-latest-rev () - (cond ((eq sc-mode 'CCASE) - (eval "main/LATEST")) - (t (eval "")))) - -(defun ediff-generic-sc-internal (rev1 rev2 &optional startup-hooks) -;; Run Ediff on versions of the current buffer. -;; If REV2 is "" then compare current buffer with REV1. -;; If the current buffer is named `F', the version is named `F.~REV~'. -;; If `F.~REV~' already exists, it is used instead of being re-created. - (let (rev1buf rev2buf) - (save-excursion - (if (or (not rev1) (string= rev1 "")) - (setq rev1 (generic-sc-get-latest-rev))) - (sc-visit-previous-revision rev1) - (setq rev1buf (current-buffer))) - (save-excursion - (or (string= rev2 "") ; use current buffer - (sc-visit-previous-revision rev2)) - (setq rev2buf (current-buffer))) - (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision))) - - ;;; Merge with Version Control (defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev @@ -245,76 +212,6 @@ comparison or merge operations are being performed." (ediff-merge-buffers buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file)))) -(defun ediff-generic-sc-merge-internal (rev1 rev2 ancestor-rev - &optional - startup-hooks merge-buffer-file) - ;; If ANCESTOR-REV non-nil, merge with ancestor - (let (buf1 buf2 ancestor-buf) - (save-excursion - (if (string= rev1 "") - (setq rev1 (generic-sc-get-latest-rev))) - (sc-visit-previous-revision rev1) - (setq buf1 (current-buffer))) - (save-excursion - (or (string= rev2 "") - (sc-visit-previous-revision rev2)) - (setq buf2 (current-buffer))) - (if ancestor-rev - (save-excursion - (or (string= ancestor-rev "") - (sc-visit-previous-revision ancestor-rev)) - (setq ancestor-buf (current-buffer)))) - (if ancestor-rev - (ediff-merge-buffers-with-ancestor - buf1 buf2 ancestor-buf - startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file) - (ediff-merge-buffers - buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file)))) - - -;; PCL-CVS.el support - -;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs -(defun cvs-run-ediff-on-file-descriptor (tin) -;; This is a replacement for cvs-emerge-mode -;; Runs after cvs-update. -;; Ediff-merge appropriate revisions of the selected file. - (let* ((fileinfo (tin-cookie cvs-cookie-handle tin)) - (type (cvs-fileinfo->type fileinfo)) - (tmp-file - (cvs-retrieve-revision-to-tmpfile fileinfo)) - (default-directory - (file-name-as-directory (cvs-fileinfo->dir fileinfo))) - ancestor-file) - - (or (memq type '(MERGED CONFLICT MODIFIED)) - (error - "Can only merge `Modified', `Merged' or `Conflict' files")) - - (cond ((memq type '(MERGED CONFLICT)) - (setq ancestor-file - (cvs-retrieve-revision-to-tmpfile - fileinfo - ;; revision - (cvs-fileinfo->base-revision fileinfo))) - (ediff-merge-buffers-with-ancestor - (find-file-noselect tmp-file) - (find-file-noselect (cvs-fileinfo->backup-file fileinfo)) - (find-file-noselect ancestor-file) - nil ; startup-hooks - 'ediff-merge-revisions-with-ancestor)) - ((eq type 'MODIFIED) - (ediff-buffers - (find-file-noselect tmp-file) - (if (featurep 'xemacs) - ;; XEmacs doesn't seem to have cvs-fileinfo->full-name - (find-file-noselect (cvs-fileinfo->full-path fileinfo)) - (find-file-noselect (cvs-fileinfo->full-name fileinfo))) - nil ; startup-hooks - 'ediff-revisions))) - (if (stringp tmp-file) (ediff-delete-version-file tmp-file)) - (if (stringp ancestor-file) (ediff-delete-version-file ancestor-file)))) - ;; delete version file on exit unless ediff-keep-tmp-versions is true (defun ediff-delete-version-file (file) diff --git a/lisp/ediff.el b/lisp/ediff.el index 7475834fba6..8911dc599f1 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -1303,20 +1303,6 @@ buffer." (intern (format "ediff-%S-merge-internal" ediff-version-control-package)) rev1 rev2 ancestor-rev startup-hooks merge-buffer-file))) -;; MK: Check. This function doesn't seem to be used any more by pcvs or pcl-cvs -;;;###autoload -(defun run-ediff-from-cvs-buffer (pos) - "Run Ediff-merge on appropriate revisions of the selected file. -First run after `M-x cvs-update'. Then place the cursor on a line describing a -file and then run `run-ediff-from-cvs-buffer'." - (interactive "d") - (ediff-load-version-control) - (let ((tin (tin-locate cvs-cookie-handle pos))) - (if tin - (cvs-run-ediff-on-file-descriptor tin) - (error "There is no file to merge")))) - - ;;; Apply patch ;;;###autoload diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index c2d00a8ffba..e6fdd55f7c4 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el @@ -874,7 +874,7 @@ is the name of the register for COM." (set-mark beg)) (beginning-of-line) (exchange-point-and-mark) - (if (or (not (eobp)) (not (bolp))) (next-line 1)) + (if (or (not (eobp)) (not (bolp))) (with-no-warnings (next-line 1))) (beginning-of-line) (if (> beg end) (exchange-point-and-mark))) @@ -1050,7 +1050,7 @@ command was invoked with argument > 1." (defun vip-line (arg) (let ((val (car arg)) (com (cdr arg))) (move-marker vip-com-point (point)) - (next-line (1- val)) + (with-no-warnings (next-line (1- val))) (vip-execute-com 'vip-line val com))) (defun vip-yank-line (arg) @@ -1263,7 +1263,7 @@ beginning of buffer, stop and signal error." (interactive "P") (let ((val (vip-p-val arg)) (com (vip-getCom arg))) (if com (move-marker vip-com-point (point))) - (next-line val) + (with-no-warnings (next-line val)) (back-to-indentation) (if com (vip-execute-com 'vip-next-line-at-bol val com)))) @@ -1272,7 +1272,7 @@ beginning of buffer, stop and signal error." (interactive "P") (let ((val (vip-p-val arg)) (com (vip-getCom arg))) (if com (move-marker vip-com-point (point))) - (next-line (- val)) + (with-no-warnings (next-line (- val))) (setq this-command 'previous-line) (if com (vip-execute-com 'vip-previous-line val com)))) @@ -1281,7 +1281,7 @@ beginning of buffer, stop and signal error." (interactive "P") (let ((val (vip-p-val arg)) (com (vip-getCom arg))) (if com (move-marker vip-com-point (point))) - (next-line (- val)) + (with-no-warnings (next-line (- val))) (back-to-indentation) (if com (vip-execute-com 'vip-previous-line val com)))) @@ -1323,7 +1323,7 @@ after search." ;; forward search begins here (if (eolp) (error "") (point)) ;; forward search ends here - (progn (next-line 1) (beginning-of-line) (point))) + (progn (with-no-warnings (next-line 1)) (beginning-of-line) (point))) (narrow-to-region ;; backward search begins from here (if (bolp) (error "") (point)) @@ -1803,7 +1803,7 @@ STRING. Search will be forward if FORWARD, otherwise backward." (setq vip-use-register nil) (if (vip-end-with-a-newline-p text) (progn - (next-line 1) + (with-no-warnings (next-line 1)) (beginning-of-line)) (if (and (not (eolp)) (not (eobp))) (forward-char))) (setq vip-d-com (list 'vip-put-back val nil vip-use-register)) @@ -2883,7 +2883,7 @@ a token has type \(command, address, end-mark\) and value." (let ((point (if (null ex-addresses) (point) (car ex-addresses))) (variant nil) command file) (goto-char point) - (if (not (= point 0)) (next-line 1)) + (if (not (= point 0)) (with-no-warnings (next-line 1))) (beginning-of-line) (save-window-excursion (set-buffer " *ex-working-space*") diff --git a/lisp/iimage.el b/lisp/iimage.el index 29d98cbda69..f662d9f1042 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el @@ -109,11 +109,7 @@ Examples of image filename regexps: (interactive) (iimage-mode 0)) -;; Emacs21.3 or earlier does not heve locate-file. -(if (fboundp 'locate-file) - (defalias 'iimage-locate-file 'locate-file) - (defun iimage-locate-file (filename path) - (locate-library filename t path))) +(defalias 'iimage-locate-file 'locate-file) (defun iimage-mode-buffer (arg) "Display/undisplay images. diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el index 8862e6ca2d2..b75e10096dd 100644 --- a/lisp/mail/mailabbrev.el +++ b/lisp/mail/mailabbrev.el @@ -612,7 +612,7 @@ and more reliable (no dependence on goal column, etc.)." (interactive "p") (if (looking-at "[ \t]*\n") (expand-abbrev)) (setq this-command 'next-line) - (next-line arg)) + (with-no-warnings (next-line arg))) (defun mail-abbrev-end-of-buffer (&optional arg) "Expand any mail abbrev, then move point to end of buffer. diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index 60dcdc625a8..f4ab9e5e4f3 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el @@ -1091,15 +1091,19 @@ EXECUTION-TIME holds info about the time it takes, number or string.") (defun mixal-run () "Run mixal file in current buffer, assumes that file has been compiled." (interactive) - (mixvm (concat "mixvm -r -t -d " - (file-name-sans-extension (buffer-file-name))))) + (if (fboundp 'mixvm) + (mixvm (concat "mixvm -r -t -d " + (file-name-sans-extension (buffer-file-name)))) + (error "mixvm.el needs to be loaded to run `mixvm'"))) (defun mixal-debug () "Start mixvm for debugging. Assumes that file has been compiled with debugging support." (interactive) - (mixvm (concat "mixvm " - (file-name-sans-extension (buffer-file-name))))) + (if (fboundp 'mixvm) + (mixvm (concat "mixvm " + (file-name-sans-extension (buffer-file-name)))) + (error "mixvm.el needs to be loaded to run `mixvm'"))) ;;;###autoload (define-derived-mode mixal-mode fundamental-mode "mixal" diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el index db5d6552c84..e0b04cfebe8 100644 --- a/lisp/progmodes/simula.el +++ b/lisp/progmodes/simula.el @@ -1615,9 +1615,9 @@ If not nil and not t, move to limit of search and return nil." (simula-install-standard-abbrevs)) ;; Hilit mode support. -(if (and (fboundp 'hilit-set-mode-patterns) - (boundp 'hilit-patterns-alist) - (not (assoc 'simula-mode hilit-patterns-alist))) +(when (fboundp 'hilit-set-mode-patterns) + (when (and (boundp 'hilit-patterns-alist) + (not (assoc 'simula-mode hilit-patterns-alist))) (hilit-set-mode-patterns 'simula-mode '( @@ -1626,7 +1626,7 @@ If not nil and not t, move to limit of search and return nil." ("\"[^\"\n]*\"\\|'.'\\|'![0-9]+!'" nil string) ("\\<\\(ACTIVATE\\|AFTER\\|AND\\|ARRAY\\|AT\\|BEFORE\\|BEGIN\\|BOOLEAN\\|CHARACTER\\|CLASS\\|DELAY\\|DO\\|ELSE\\|END\\|EQ\\|EQV\\|EXTERNAL\\|FALSE\\|FOR\\|GE\\|GO\\|GOTO\\|GT\\|HIDDEN\\|IF\\|IMP\\|IN\\|INNER\\|INSPECT\\|INTEGER\\|IS\\|LABEL\\|LE\\|LONG\\|LT\\|NAME\\|NE\\|NEW\\|NONE\\|NOT\\|NOTEXT\\|OR\\|OTHERWISE\\|PRIOR\\|PROCEDURE\\|PROTECTED\\|QUA\\|REACTIVATE\\|REAL\\|REF\\|SHORT\\|STEP\\|SWITCH\\|TEXT\\|THEN\\|THIS\\|TO\\|TRUE\\|UNTIL\\|VALUE\\|VIRTUAL\\|WHEN\\|WHILE\\)\\>" nil keyword) ("!\\|\\<COMMENT\\>" ";" comment)) - nil 'case-insensitive)) + nil 'case-insensitive))) ;; defuns for submitting bug reports diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 0c1beb17763..5383d88c386 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -338,6 +338,169 @@ (defvar reftex-toc-auto-recenter-timer nil "The idle timer used to recenter the toc window.") +;;; ========================================================================= +;;; +;;; Parser functions + +(autoload 'reftex-parse-one "reftex-parse" + "Re-parse this file." t) +(autoload 'reftex-parse-all "reftex-parse" + "Re-parse entire document." t) +(autoload 'reftex-do-parse "reftex-parse") +(autoload 'reftex-where-am-I "reftex-parse") +(autoload 'reftex-init-section-numbers "reftex-parse") +(autoload 'reftex-section-info "reftex-parse") +(autoload 'reftex-section-number "reftex-parse") +(autoload 'reftex-what-macro "reftex-parse") +(autoload 'reftex-what-macro-safe "reftex-parse") +(autoload 'reftex-index-info "reftex-parse") +(autoload 'reftex-index-info-safe "reftex-parse") +(autoload 'reftex-short-context "reftex-parse") +(autoload 'reftex-what-environment "reftex-parse") +(autoload 'reftex-what-special-env "reftex-parse") +(autoload 'reftex-move-over-touching-args "reftex-parse") +(autoload 'reftex-notice-new "reftex-parse") +(autoload 'reftex-nth-arg "reftex-parse") +(autoload 'reftex-locate-bibliography-files "reftex-parse") +(autoload 'reftex-ensure-index-support "reftex-parse") +(autoload 'reftex-everything-regexp "reftex-parse") + + +;;; ========================================================================= +;;; +;;; Labels and References + +(autoload 'reftex-label-location "reftex-ref") +(autoload 'reftex-label-info-update "reftex-ref") +(autoload 'reftex-label-info "reftex-ref") +(autoload 'reftex-label "reftex-ref" + "Insert a unique label." t) +(autoload 'reftex-reference "reftex-ref" + "Make a LaTeX reference." t) +(autoload 'reftex-varioref-vref "reftex-ref" + "Make a varioref reference." t) +(autoload 'reftex-fancyref-fref "reftex-ref" + "Make a fancyref \\fref reference." t) +(autoload 'reftex-fancyref-Fref "reftex-ref" + "Make a fancyref \\Fref reference." t) +(autoload 'reftex-show-label-location "reftex-ref") +(autoload 'reftex-query-label-type "reftex-ref") +(autoload 'reftex-goto-label "reftex-ref" + "Prompt for label name and go to that location." t) + +;;; ========================================================================= +;;; +;;; Table of contents + +(autoload 'reftex-toc "reftex-toc" + "Show the table of contents for the current document." t) +(autoload 'reftex-toc-recenter "reftex-toc" + "Display the TOC window and highlight line corresponding to current position." t) +(autoload 'reftex-toggle-auto-toc-recenter "reftex-toc" + "Toggle automatic recentering of TOC window." t) + +;;; ========================================================================= +;;; +;;; BibTeX citations. + +(autoload 'reftex-citep "reftex-cite") +(autoload 'reftex-citet "reftex-cite") +(autoload 'reftex-make-cite-echo-string "reftex-cite") +(autoload 'reftex-get-bibfile-list "reftex-cite") +(autoload 'reftex-pop-to-bibtex-entry "reftex-cite") +(autoload 'reftex-end-of-bib-entry "reftex-cite") +(autoload 'reftex-parse-bibtex-entry "reftex-cite") +(autoload 'reftex-citation "reftex-cite" + "Make a citation using BibTeX database files." t) +(autoload 'reftex-default-bibliography "reftex-cite") +(autoload 'reftex-bib-or-thebib "reftex-cite") +(autoload 'reftex-create-bibtex-file "reftex-cite") + +;;; ========================================================================= +;;; +;;; Selection + +(autoload 'reftex-select-label-mode "reftex-sel") +(autoload 'reftex-select-bib-mode "reftex-sel") +(autoload 'reftex-find-start-point "reftex-sel") +(autoload 'reftex-insert-docstruct "reftex-sel") +(autoload 'reftex-get-offset "reftex-sel") +(autoload 'reftex-select-item "reftex-sel") + + +;;; ========================================================================= +;;; +;;; Index support + +(autoload 'reftex-index "reftex-index" + "Query for an index macro and insert it along with its argments." t) +(autoload 'reftex-index-selection-or-word "reftex-index" + "Put selection or the word near point into the default index macro." t) +(autoload 'reftex-index-phrase-selection-or-word "reftex-index" + "Put selection or the word near point into Index Phrases File." t) +(autoload 'reftex-display-index "reftex-index" + "Display a buffer with an index compiled from the current document." t) +(autoload 'reftex-index-visit-phrases-buffer "reftex-index" + "Visit the Index Phrases File." t) +(autoload 'reftex-index-phrases-mode "reftex-index" + "Major mode for managing the Index phrases of a LaTeX document." t) +(autoload 'reftex-index-complete-tag "reftex-index") +(autoload 'reftex-index-complete-key "reftex-index") +(autoload 'reftex-index-show-entry "reftex-index") +(autoload 'reftex-index-select-tag "reftex-index") + + +;;; ========================================================================= +;;; +;;; View cross references + +(autoload 'reftex-view-crossref "reftex-dcr" + "View cross reference of \\ref or \\cite macro at point." t) +(autoload 'reftex-mouse-view-crossref "reftex-dcr" + "View cross reference of \\ref or \\cite macro where you click." t) +(autoload 'reftex-toggle-auto-view-crossref "reftex-dcr") +(autoload 'reftex-view-crossref-from-bibtex "reftex-dcr" + "View location in a LaTeX document which cites the BibTeX entry at point." t) + + +;;; ========================================================================= +;;; +;;; Operations on entire Multifile documents + +(autoload 'reftex-create-tags-file "reftex-global" + "Create TAGS file by running `etags' on the current document." t) +(autoload 'reftex-grep-document "reftex-global" + "Run grep query through all files related to this document." t) +(autoload 'reftex-search-document "reftex-global" + "Regexp search through all files of the current TeX document." t) +(autoload 'reftex-query-replace-document "reftex-global" + "Run a query-replace-regexp of FROM with TO over the entire TeX document." t) +(autoload 'reftex-find-duplicate-labels "reftex-global" + "Produce a list of all duplicate labels in the document." t) +(autoload 'reftex-change-label "reftex-global" + "Query replace FROM with TO in all \\label and \\ref commands." t) +(autoload 'reftex-renumber-simple-labels "reftex-global" + "Renumber all simple labels in the document to make them sequentially." t) +(autoload 'reftex-save-all-document-buffers "reftex-global" + "Save all documents associated with the current document." t) + + +;;; ========================================================================= +;;; +;;; AUCTeX Interface + +(autoload 'reftex-arg-label "reftex-auc") +(autoload 'reftex-arg-cite "reftex-auc") +(autoload 'reftex-arg-index-tag "reftex-auc") +(autoload 'reftex-arg-index "reftex-auc") +(autoload 'reftex-plug-into-AUCTeX "reftex-auc") +(autoload 'reftex-toggle-plug-into-AUCTeX "reftex-auc" + "Toggle Interface between AUCTeX and RefTeX on and off." t) +(autoload 'reftex-add-label-environments "reftex-auc") +(autoload 'reftex-add-to-label-alist "reftex-auc") +(autoload 'reftex-add-section-levels "reftex-auc") +(autoload 'reftex-notice-new-section "reftex-auc") + ;;;###autoload (defun turn-on-reftex () "Turn on RefTeX mode." @@ -1608,169 +1771,6 @@ When DIE is non-nil, throw an error if file not found." ;;; ========================================================================= ;;; -;;; Parser functions - -(autoload 'reftex-parse-one "reftex-parse" - "Re-parse this file." t) -(autoload 'reftex-parse-all "reftex-parse" - "Re-parse entire document." t) -(autoload 'reftex-do-parse "reftex-parse") -(autoload 'reftex-where-am-I "reftex-parse") -(autoload 'reftex-init-section-numbers "reftex-parse") -(autoload 'reftex-section-info "reftex-parse") -(autoload 'reftex-section-number "reftex-parse") -(autoload 'reftex-what-macro "reftex-parse") -(autoload 'reftex-what-macro-safe "reftex-parse") -(autoload 'reftex-index-info "reftex-parse") -(autoload 'reftex-index-info-safe "reftex-parse") -(autoload 'reftex-short-context "reftex-parse") -(autoload 'reftex-what-environment "reftex-parse") -(autoload 'reftex-what-special-env "reftex-parse") -(autoload 'reftex-move-over-touching-args "reftex-parse") -(autoload 'reftex-notice-new "reftex-parse") -(autoload 'reftex-nth-arg "reftex-parse") -(autoload 'reftex-locate-bibliography-files "reftex-parse") -(autoload 'reftex-ensure-index-support "reftex-parse") -(autoload 'reftex-everything-regexp "reftex-parse") - - -;;; ========================================================================= -;;; -;;; Labels and References - -(autoload 'reftex-label-location "reftex-ref") -(autoload 'reftex-label-info-update "reftex-ref") -(autoload 'reftex-label-info "reftex-ref") -(autoload 'reftex-label "reftex-ref" - "Insert a unique label." t) -(autoload 'reftex-reference "reftex-ref" - "Make a LaTeX reference." t) -(autoload 'reftex-varioref-vref "reftex-ref" - "Make a varioref reference." t) -(autoload 'reftex-fancyref-fref "reftex-ref" - "Make a fancyref \\fref reference." t) -(autoload 'reftex-fancyref-Fref "reftex-ref" - "Make a fancyref \\Fref reference." t) -(autoload 'reftex-show-label-location "reftex-ref") -(autoload 'reftex-query-label-type "reftex-ref") -(autoload 'reftex-goto-label "reftex-ref" - "Prompt for label name and go to that location." t) - -;;; ========================================================================= -;;; -;;; Table of contents - -(autoload 'reftex-toc "reftex-toc" - "Show the table of contents for the current document." t) -(autoload 'reftex-toc-recenter "reftex-toc" - "Display the TOC window and highlight line corresponding to current position." t) -(autoload 'reftex-toggle-auto-toc-recenter "reftex-toc" - "Toggle automatic recentering of TOC window." t) - -;;; ========================================================================= -;;; -;;; BibTeX citations. - -(autoload 'reftex-citep "reftex-cite") -(autoload 'reftex-citet "reftex-cite") -(autoload 'reftex-make-cite-echo-string "reftex-cite") -(autoload 'reftex-get-bibfile-list "reftex-cite") -(autoload 'reftex-pop-to-bibtex-entry "reftex-cite") -(autoload 'reftex-end-of-bib-entry "reftex-cite") -(autoload 'reftex-parse-bibtex-entry "reftex-cite") -(autoload 'reftex-citation "reftex-cite" - "Make a citation using BibTeX database files." t) -(autoload 'reftex-default-bibliography "reftex-cite") -(autoload 'reftex-bib-or-thebib "reftex-cite") -(autoload 'reftex-create-bibtex-file "reftex-cite") - -;;; ========================================================================= -;;; -;;; Selection - -(autoload 'reftex-select-label-mode "reftex-sel") -(autoload 'reftex-select-bib-mode "reftex-sel") -(autoload 'reftex-find-start-point "reftex-sel") -(autoload 'reftex-insert-docstruct "reftex-sel") -(autoload 'reftex-get-offset "reftex-sel") -(autoload 'reftex-select-item "reftex-sel") - - -;;; ========================================================================= -;;; -;;; Index support - -(autoload 'reftex-index "reftex-index" - "Query for an index macro and insert it along with its argments." t) -(autoload 'reftex-index-selection-or-word "reftex-index" - "Put selection or the word near point into the default index macro." t) -(autoload 'reftex-index-phrase-selection-or-word "reftex-index" - "Put selection or the word near point into Index Phrases File." t) -(autoload 'reftex-display-index "reftex-index" - "Display a buffer with an index compiled from the current document." t) -(autoload 'reftex-index-visit-phrases-buffer "reftex-index" - "Visit the Index Phrases File." t) -(autoload 'reftex-index-phrases-mode "reftex-index" - "Major mode for managing the Index phrases of a LaTeX document." t) -(autoload 'reftex-index-complete-tag "reftex-index") -(autoload 'reftex-index-complete-key "reftex-index") -(autoload 'reftex-index-show-entry "reftex-index") -(autoload 'reftex-index-select-tag "reftex-index") - - -;;; ========================================================================= -;;; -;;; View cross references - -(autoload 'reftex-view-crossref "reftex-dcr" - "View cross reference of \\ref or \\cite macro at point." t) -(autoload 'reftex-mouse-view-crossref "reftex-dcr" - "View cross reference of \\ref or \\cite macro where you click." t) -(autoload 'reftex-toggle-auto-view-crossref "reftex-dcr") -(autoload 'reftex-view-crossref-from-bibtex "reftex-dcr" - "View location in a LaTeX document which cites the BibTeX entry at point." t) - - -;;; ========================================================================= -;;; -;;; Operations on entire Multifile documents - -(autoload 'reftex-create-tags-file "reftex-global" - "Create TAGS file by running `etags' on the current document." t) -(autoload 'reftex-grep-document "reftex-global" - "Run grep query through all files related to this document." t) -(autoload 'reftex-search-document "reftex-global" - "Regexp search through all files of the current TeX document." t) -(autoload 'reftex-query-replace-document "reftex-global" - "Run a query-replace-regexp of FROM with TO over the entire TeX document." t) -(autoload 'reftex-find-duplicate-labels "reftex-global" - "Produce a list of all duplicate labels in the document." t) -(autoload 'reftex-change-label "reftex-global" - "Query replace FROM with TO in all \\label and \\ref commands." t) -(autoload 'reftex-renumber-simple-labels "reftex-global" - "Renumber all simple labels in the document to make them sequentially." t) -(autoload 'reftex-save-all-document-buffers "reftex-global" - "Save all documents associated with the current document." t) - - -;;; ========================================================================= -;;; -;;; AUCTeX Interface - -(autoload 'reftex-arg-label "reftex-auc") -(autoload 'reftex-arg-cite "reftex-auc") -(autoload 'reftex-arg-index-tag "reftex-auc") -(autoload 'reftex-arg-index "reftex-auc") -(autoload 'reftex-plug-into-AUCTeX "reftex-auc") -(autoload 'reftex-toggle-plug-into-AUCTeX "reftex-auc" - "Toggle Interface between AUCTeX and RefTeX on and off." t) -(autoload 'reftex-add-label-environments "reftex-auc") -(autoload 'reftex-add-to-label-alist "reftex-auc") -(autoload 'reftex-add-section-levels "reftex-auc") -(autoload 'reftex-notice-new-section "reftex-auc") - -;;; ========================================================================= -;;; ;;; Some generally useful functions (defun reftex-typekey-check (typekey conf-variable &optional n) @@ -2334,16 +2334,14 @@ IGNORE-WORDS List of words which should be removed from the string." (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)) +(defalias 'reftex-make-overlay + (if (featurep 'xemacs) 'make-extent 'make-overlay)) +(defalias 'reftex-overlay-put + (if (featurep 'xemacs) 'set-extent-property 'overlay-put)) +(defalias 'reftex-move-overlay + (if (featurep 'xemacs) 'set-extent-endpoints 'move-overlay)) +(defalias 'reftex-delete-overlay + (if (featurep 'xemacs) 'detach-extent 'delete-overlay)) ;; We keep a vector with several different overlays to do our highlighting. (defvar reftex-highlight-overlays [nil nil nil]) |