* pop3.el: Silence the byte-compiler when modifying

 `byte-compile-function-environment' for `md5' under latest Emacs.

diff --git a/ChangeLog b/ChangeLog
index c9ca4aa..9af3bcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-07-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * lisp/pop3.el: Silence the byte-compiler when modifying
+       `byte-compile-function-environment' for `md5' under latest Emacs.
+
        * texi/ptexinfmt.el (texinfo-discard-command-and-arg): Revive it
        for Mule 2.
 

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 510884f..3bb1de5 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -511,18 +511,16 @@ If NOW, use that time instead."
 ;; tree, `md5' might have been defined in w3/md5.el, ./lpath.el or one
 ;; of some other libraries and `md5' will accept only 3 arguments.  We
 ;; will deceive the byte-compiler not to say warnings.
-(eval-and-compile
-  (if (fboundp 'eval-when)
-      ;; `eval-when' might not be provided when loading .el file.
-      (eval-when 'compile
-       (let ((def (assq 'md5 byte-compile-function-environment)))
-         (if def
-             (setcdr def '(lambda (object &optional start end
-                                          coding-system noerror)))
-           (setq byte-compile-function-environment
-                 (cons '(md5 . (lambda (object &optional start end
-                                               coding-system noerror)))
-                       byte-compile-function-environment)))))))
+(eval-when-compile
+  (if (boundp 'byte-compile-function-environment)
+      (let ((def (assq 'md5 byte-compile-function-environment)))
+       (if def
+           (setcdr def '(lambda (object &optional start end
+                                        coding-system noerror)))
+         (setq byte-compile-function-environment
+               (cons '(md5 . (lambda (object &optional start end
+                                             coding-system noerror)))
+                     byte-compile-function-environment))))))
 
 ;; Note that `pop3-md5' should never encode a given string to use for
 ;; the apop authentication.