branch: elpa/vm commit fbe2f525c5e2f72675d8e436229a235c28be8b38 Author: Stefan Monnier <monn...@iro.umontreal.ca> Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Move `defvar`s out of `eval-when-compile` --- lisp/vm-mime.el | 24 +++++++++--------------- lisp/vm-pgg.el | 15 ++++++--------- lisp/vm-vars.el | 13 ------------- 3 files changed, 15 insertions(+), 37 deletions(-) diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el index f9449ad239..b1acbb18aa 100644 --- a/lisp/vm-mime.el +++ b/lisp/vm-mime.el @@ -90,10 +90,9 @@ ;; A lot of the more complicated MIME character set processing is only ;; practical under MULE. -(eval-when-compile - (defvar latin-unity-ucs-list) - (defvar latin-unity-character-sets) - (defvar coding-system-list)) +(defvar latin-unity-ucs-list) +(defvar latin-unity-character-sets) +(defvar coding-system-list) (defun vm-get-coding-system-priorities () "Return the value of `vm-coding-system-priorities', or a reasonable @@ -141,13 +140,12 @@ default for it if it's nil. " it's nil. This is used instead of `vm-mime-ucs-list' directly in order to allow runtime checks for optional features like `mule-ucs' or `latin-unity'. " - (if vm-mime-ucs-list - vm-mime-ucs-list - (if (featurep 'latin-unity) - latin-unity-ucs-list - (if (vm-coding-system-p 'utf-8) - '(utf-8 iso-2022-jp ctext escape-quoted) - '(iso-2022-jp ctext escape-quoted))))) + (or vm-mime-ucs-list + (if (featurep 'latin-unity) + latin-unity-ucs-list + (if (vm-coding-system-p 'utf-8) + '(utf-8 iso-2022-jp ctext escape-quoted) + '(iso-2022-jp ctext escape-quoted))))) (defun vm-update-mime-charset-maps () "Check for the presence of certain Mule coding systems, and add @@ -180,10 +178,6 @@ configuration. " (add-to-list 'vm-mime-mule-coding-to-charset-alist '(iso-8859-1 "iso-8859-1"))) -(eval-when-compile - (when (not (featurep 'xemacs)) - (defvar latin-unity-character-sets nil))) - (when (featurep 'xemacs) (require 'vm-vars) (vm-update-mime-charset-maps) diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el index 3988a7b7f3..e8c673b6d6 100644 --- a/lisp/vm-pgg.el +++ b/lisp/vm-pgg.el @@ -107,15 +107,12 @@ (declare-function rfc822-addresses "ext:rfc822" (header-text)) -(eval-when-compile - ;; avoid warnings - (defvar vm-mode-line-format) - (defvar vm-message-pointer) - (defvar vm-presentation-buffer) - (defvar vm-summary-buffer) - ;; avoid bytecompile warnings - (defvar vm-pgg-cleartext-state nil "For interfunction communication.") -) +;; avoid warnings +(defvar vm-mode-line-format) +(defvar vm-message-pointer) +(defvar vm-presentation-buffer) +(defvar vm-summary-buffer) +(defvar vm-pgg-cleartext-state) ; group already defined in vm-vars.el ;(defgroup vm nil diff --git a/lisp/vm-vars.el b/lisp/vm-vars.el index 4507c9fb8a..37228f0ba7 100644 --- a/lisp/vm-vars.el +++ b/lisp/vm-vars.el @@ -7116,19 +7116,6 @@ Possible values are `inactive' - session is inactive") (make-variable-buffer-local 'vm-imap-session-type) -(eval-when-compile - (defvar current-itimer nil) - (defvar current-menubar nil) - (defvar scrollbar-height nil) - (defvar top-toolbar nil) - (defvar top-toolbar-height nil) - (defvar bottom-toolbar nil) - (defvar bottom-toolbar-height nil) - (defvar right-toolbar nil) - (defvar right-toolbar-width nil) - (defvar left-toolbar nil) - (defvar left-toolbar-width nil)) - (defvar vm-fsfemacs-toolbar-installed-p nil) ;; this defvar matches the XEmacs one so it doesn't matter if VM ;; is loaded before highlight-headers.el