2 files changed, 12 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 674a8ec5568..5667a43c2ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-14  Romain Francoise  <romain@orebokech.com>
+
+        * dired-x.el: If `vm-visit-folder' doesn't exist, define it as a
+        dummy function in `eval-when-compile' to avoid compiler warning.
+        Require `man' at compile time.
+
 2005-11-14  Jay Belanger  <belanger@truman.edu>
 
         * calc-alg.el (calcFunc-write-out-power): Rename it to
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index e48d6780c48..14e0a459f86 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -112,6 +112,7 @@
 (require 'dired-aux)
 
 (defvar vm-folder-directory)
+(eval-when-compile (require 'man))
 
 ;;; User-defined variables.
 
@@ -1411,9 +1412,11 @@ Uses `man.el' of \\[manual-entry] fame."
 
 ;;; Run mail on mail folders.
 
-;;; (and (not (fboundp 'vm-visit-folder))
-;;;      (defun vm-visit-folder (file &optional arg)
-;;;        nil))
+;; Avoid compiler warning.
+(eval-when-compile
+  (when (not (fboundp 'vm-visit-folder))
+    (defun vm-visit-folder (file &optional arg)
+      nil)))
 
 (defun dired-vm (&optional read-only)
   "Run VM on this file.