Synch to No Gnus 200506020610.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06ce7b3..d01f200 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * pop3.el (pop3-apop): Run md5 in the binary mode.
+
+       * starttls.el (starttls-set-process-query-on-exit-flag): Use
+       eval-and-compile.
+
 2005-05-31  Simon Josefsson  <jas@extundo.com>
 
        * smime.el (smime-replace-in-string): Define.

diff --git a/lisp/starttls.el b/lisp/starttls.el
index 4a7c69c..2606c4c 100644 (file)
--- a/lisp/starttls.el
+++ b/lisp/starttls.el
@@ -236,11 +236,12 @@ handshake, or NIL on failure."
       (starttls-negotiate-gnutls process)
     (signal-process (process-id process) 'SIGALRM)))
 
-(if (fboundp 'set-process-query-on-exit-flag)
+(eval-and-compile
+  (if (fboundp 'set-process-query-on-exit-flag)
+      (defalias 'starttls-set-process-query-on-exit-flag
+       'set-process-query-on-exit-flag)
     (defalias 'starttls-set-process-query-on-exit-flag
-      'set-process-query-on-exit-flag)
-  (defalias 'starttls-set-process-query-on-exit-flag
-    'process-kill-without-query))
+      'process-kill-without-query)))
 
 (defun starttls-open-stream-gnutls (name buffer host service)
   (message "Opening STARTTLS connection to `%s'..." host)