[nongnu] elpa/vm e042125a53 3/5: Make some dependencies more explicit

[ELPA Syncer]

branch: elpa/vm
commit e042125a532ad99c5b30ef5069ac723623b6732d
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Make some dependencies more explicit
    
    Compilation of individual files failed without them.
    Also remove redundant (require 'advice).
    
    * lisp/vm-avirtual.el, lisp/vm-sort.el: Require `vm-vars` to make sure
    `vm-supported-sort-keys` is defined.
    
    * lisp/vm-pine.el: Require `vm-vars` to make sure
    `vm-mail-mode-map` is defined.
    
    * lisp/vm-rfaddons.el, lisp/vm-w3m.el, lisp/vm-w3.el: Require `vm-version`
    to make sure `vm-load-features` is defined.
    
    * lisp/vm-vars.el (vm-supported-sort-keys): Don't define it as
    a constant since we modify it with `add-to-list`.
---
 contrib/vm-sumurg.el | 2 --
 lisp/vm-avirtual.el  | 2 +-
 lisp/vm-pcrisis.el   | 1 -
 lisp/vm-pgg.el       | 4 +---
 lisp/vm-pine.el      | 1 +
 lisp/vm-rfaddons.el  | 2 +-
 lisp/vm-serial.el    | 3 +--
 lisp/vm-sort.el      | 1 +
 lisp/vm-vars.el      | 2 +-
 lisp/vm-w3.el        | 2 +-
 lisp/vm-w3m.el       | 1 +
 11 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/contrib/vm-sumurg.el b/contrib/vm-sumurg.el
index c9be3fc8fd..ca9358ecbf 100644
--- a/contrib/vm-sumurg.el
+++ b/contrib/vm-sumurg.el
@@ -486,8 +486,6 @@
 (add-hook 'vm-mode-hook ' vm-sumurg-vm-mode-hook-fn)
 (add-hook 'vm-presentation-mode-hook ' vm-sumurg-vm-mode-hook-fn)
 
-(require 'advice)
-
 (defadvice  vm-do-needed-mode-line-update
   (before vm-sumurg-dnmlu activate compile)
   (when (and vm-message-pointer vm-ml-sumurg-extent)
diff --git a/lisp/vm-avirtual.el b/lisp/vm-avirtual.el
index 0f72b68378..730b1ba75e 100644
--- a/lisp/vm-avirtual.el
+++ b/lisp/vm-avirtual.el
@@ -107,6 +107,7 @@
 
 (require 'vm-macro)
 (require 'vm-virtual)
+(require 'vm-vars)
 
 (eval-when-compile
   (require 'vm-misc)
@@ -148,7 +149,6 @@
   (require 'cl))
 
 (eval-and-compile
-  (require 'advice)
   (require 'regexp-opt)
   (require 'time-date)
                            
diff --git a/lisp/vm-pcrisis.el b/lisp/vm-pcrisis.el
index 8606333457..02a68b649e 100644
--- a/lisp/vm-pcrisis.el
+++ b/lisp/vm-pcrisis.el
@@ -47,7 +47,6 @@
 (eval-when-compile
   ;; get the macros we need.
   (require 'cl)
-  (require 'advice)
   (condition-case e
       (progn 
         (require 'regexp-opt)
diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index 0ad5f380dc..b42268c71e 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -106,9 +106,7 @@
   (require 'vm-page)
   (require 'vm-mime)
   (require 'vm-reply)
-  (require 'vm-motion)
-
-  (require 'advice))
+  (require 'vm-motion))
   
 (declare-function rfc822-addresses "ext:rfc822" (header-text))
 
diff --git a/lisp/vm-pine.el b/lisp/vm-pine.el
index f41486ecbf..7f48cadff9 100644
--- a/lisp/vm-pine.el
+++ b/lisp/vm-pine.el
@@ -87,6 +87,7 @@
 (provide 'vm-pine)
 
 (require 'vm-macro)
+(require 'vm-vars)
  
 (eval-when-compile
   (require 'vm-misc)
diff --git a/lisp/vm-rfaddons.el b/lisp/vm-rfaddons.el
index 053ab16eae..e15011bb1c 100644
--- a/lisp/vm-rfaddons.el
+++ b/lisp/vm-rfaddons.el
@@ -61,6 +61,7 @@
 (provide 'vm-rfaddons)
 
 (require 'vm-macro)
+(require 'vm-version)
 
 (eval-when-compile
   (require 'vm-misc)
@@ -101,7 +102,6 @@
 
 (eval-when-compile
   (require 'cl)
-  (require 'advice)
   (vm-load-features '(regexp-opt bbdb bbdb-vm))
   ;; gnus-group removed from features because it gives errors.  USR, 2011-01-26
   )
diff --git a/lisp/vm-serial.el b/lisp/vm-serial.el
index 4a9a741b1c..b1b58f5a82 100644
--- a/lisp/vm-serial.el
+++ b/lisp/vm-serial.el
@@ -90,8 +90,7 @@
 (eval-and-compile
   (require 'vm-pine)
   (require 'mail-utils)
-  (require 'mail-extr)
-  (require 'advice))
+  (require 'mail-extr))
 
 (declare-function bbdb-extract-address-components 
                  "ext:bbdb-snarf" (adstring &optional ignore-errors))
diff --git a/lisp/vm-sort.el b/lisp/vm-sort.el
index 1e46415561..4aa3482145 100644
--- a/lisp/vm-sort.el
+++ b/lisp/vm-sort.el
@@ -25,6 +25,7 @@
 (provide 'vm-sort)
 
 (require 'vm-macro)
+(require 'vm-vars)
 
 (eval-and-compile
   (require 'vm-misc)
diff --git a/lisp/vm-vars.el b/lisp/vm-vars.el
index bf3d52306f..3d21b527aa 100644
--- a/lisp/vm-vars.el
+++ b/lisp/vm-vars.el
@@ -6767,7 +6767,7 @@ header line in email messages,
 (defvaralias 'vm-vs-spam-score-headers
   'vm-spam-score-headers)
 
-(defconst vm-supported-sort-keys
+(defvar vm-supported-sort-keys
   '("date" "reversed-date"
     "activity" "reversed-activity"
     "author" "reversed-author"
diff --git a/lisp/vm-w3.el b/lisp/vm-w3.el
index b8ec376f02..4153b58458 100644
--- a/lisp/vm-w3.el
+++ b/lisp/vm-w3.el
@@ -27,11 +27,11 @@
 
 (eval-when-compile
   (require 'cl)
-  (require 'advice)
   (require 'vm-mime)
 )
 
 (eval-and-compile
+  (require 'vm-version)
   (vm-load-features '(w3)))
 
 (declare-function w3-region "ext:w3-display.el" (st nd))
diff --git a/lisp/vm-w3m.el b/lisp/vm-w3m.el
index 2890611b60..9807ff8ed2 100644
--- a/lisp/vm-w3m.el
+++ b/lisp/vm-w3m.el
@@ -37,6 +37,7 @@
   (require 'executable))
 
 (eval-and-compile
+  (require 'vm-version)
   (vm-load-features '(w3m)))
 
 (declare-function w3m-region