From 0c86715d6c8107c8c206a82b2a03e5aae1db522d Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 20 Mar 2008 07:44:55 +0000 Subject: [PATCH] * textmodes/refbib.el: * textmodes/reftex.el: * textmodes/reftex-global.el: * textmodes/reftex-vars.el: * textmodes/reftex-toc.el: Don't use eval-and-compile for byte compiler pacifying defvars. (reftex-toc-mode): Only make zmacs-regions local on XEmacs. * textmodes/reftex-index.el (zmacs-regions): Remove pacifier, not needed. --- lisp/ChangeLog | 12 ++++++++++++ lisp/textmodes/refbib.el | 21 ++++++++++----------- lisp/textmodes/reftex-global.el | 5 ++--- lisp/textmodes/reftex-index.el | 1 - lisp/textmodes/reftex-toc.el | 4 ++-- lisp/textmodes/reftex-vars.el | 2 +- lisp/textmodes/reftex.el | 19 +++++++++---------- 7 files changed, 36 insertions(+), 28 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index de942aced73..cd909c3deb9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2008-03-20 Dan Nicolaescu + + * textmodes/refbib.el: + * textmodes/reftex.el: + * textmodes/reftex-global.el: + * textmodes/reftex-vars.el: + * textmodes/reftex-toc.el: Don't use eval-and-compile for byte + compiler pacifying defvars. + (reftex-toc-mode): Only make zmacs-regions local on XEmacs. + * textmodes/reftex-index.el (zmacs-regions): Remove pacifier, not + needed. + 2008-03-20 Wilson Snyder * progmodes/verilog-mode.el (verilog-easy-menu-filter): New diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index ae07740ee09..69565d1a31c 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el @@ -223,17 +223,16 @@ This is in addition to the `r2b-capitalize-title-stop-words'.") (defvar r2b-error-found nil) -(eval-when-compile - (defvar r2b-variables) (defvar r2bv-address) (defvar r2bv-annote) - (defvar r2bv-author) (defvar r2bv-booktitle) (defvar r2bv-date) - (defvar r2bv-decade) (defvar r2bv-editor) (defvar r2bv-entry-kind) - (defvar r2bv-institution) (defvar r2bv-journal) (defvar r2bv-keywords) - (defvar r2bv-kn) (defvar r2bv-month) (defvar r2bv-note) - (defvar r2bv-number) (defvar r2bv-ordering) (defvar r2bv-organization) - (defvar r2bv-pages) (defvar r2bv-primary-author) (defvar r2bv-publisher) - (defvar r2bv-school) (defvar r2bv-title) (defvar r2bv-title-first-word) - (defvar r2bv-tr) (defvar r2bv-type) (defvar r2bv-volume) - (defvar r2bv-where) (defvar r2bv-year)) +(defvar r2b-variables) (defvar r2bv-address) (defvar r2bv-annote) +(defvar r2bv-author) (defvar r2bv-booktitle) (defvar r2bv-date) +(defvar r2bv-decade) (defvar r2bv-editor) (defvar r2bv-entry-kind) +(defvar r2bv-institution) (defvar r2bv-journal) (defvar r2bv-keywords) +(defvar r2bv-kn) (defvar r2bv-month) (defvar r2bv-note) +(defvar r2bv-number) (defvar r2bv-ordering) (defvar r2bv-organization) +(defvar r2bv-pages) (defvar r2bv-primary-author) (defvar r2bv-publisher) +(defvar r2bv-school) (defvar r2bv-title) (defvar r2bv-title-first-word) +(defvar r2bv-tr) (defvar r2bv-type) (defvar r2bv-volume) +(defvar r2bv-where) (defvar r2bv-year) (setq r2b-variables '( r2b-error-found diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index 21bb8cf6a7a..ee5f6f85c4d 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -102,9 +102,8 @@ No active TAGS table is required." (tags-query-replace from to (or delimited current-prefix-arg) (list 'reftex-all-document-files)))) -(eval-when-compile - (defvar TeX-master) - (defvar isearch-next-buffer-function)) +(defvar TeX-master) +(defvar isearch-next-buffer-function) (defun reftex-find-duplicate-labels () "Produce a list of all duplicate labels in the document." diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index 15fba461fd3..1f69e3fbb9b 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -35,7 +35,6 @@ ;; START remove for XEmacs release (defvar mark-active) -(defvar zmacs-regions) (defvar transient-mark-mode) (defvar TeX-master) ;; END remove for XEmacs release diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index e57e9a59a73..31ca3c0cf6c 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -36,7 +36,6 @@ "Keymap used for *toc* buffer.") (defvar reftex-toc-menu) -(eval-when-compile (defvar zmacs-regions)) (defvar reftex-last-window-height nil) (defvar reftex-last-window-width nil) (defvar reftex-toc-include-labels-indicator nil) @@ -57,7 +56,8 @@ Here are all local bindings. mode-name "TOC") (use-local-map reftex-toc-map) (set (make-local-variable 'transient-mark-mode) t) - (set (make-local-variable 'zmacs-regions) t) + (when (featurep 'xemacs) + (set (make-local-variable 'zmacs-regions) t)) (set (make-local-variable 'revert-buffer-function) 'reftex-toc-revert) (set (make-local-variable 'reftex-toc-include-labels-indicator) "") (set (make-local-variable 'reftex-toc-max-level-indicator) diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index a6f91667167..6d119fc2ffa 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -27,7 +27,7 @@ ;;; Commentary: ;;; Code: -(eval-when-compile (defvar reftex-tables-dirty)) +(defvar reftex-tables-dirty) (eval-when-compile (require 'cl)) (eval-and-compile (defun reftex-set-dirty (symbol value) diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index ed74e887a0a..8a8f9249175 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -613,16 +613,15 @@ on the menu bar. ;;; ========================================================================= ;;; ;;; Silence warnings about variables in other packages. -(eval-when-compile - (defvar TeX-master) - (defvar LaTeX-section-hook) - (defvar LaTeX-label-function) - (defvar tex-main-file) - (defvar outline-minor-mode) - (defvar font-lock-mode) - (defvar font-lock-keywords) - (defvar font-lock-fontify-region-function) - (defvar font-lock-syntactic-keywords)) +(defvar TeX-master) +(defvar LaTeX-section-hook) +(defvar LaTeX-label-function) +(defvar tex-main-file) +(defvar outline-minor-mode) +(defvar font-lock-mode) +(defvar font-lock-keywords) +(defvar font-lock-fontify-region-function) +(defvar font-lock-syntactic-keywords) ;;; ========================================================================= ;;; -- 2.39.2