2 files changed, 14 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2c4d98b4d16..9fc46ad8441 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * pop3.el (pop3-set-process-query-on-exit-flag): New function that's an
+        alias to set-process-query-on-exit-flag or process-kill-without-query.
+        (pop3-open-server): Use it.
+
 2010-09-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * mail-source.el (mail-source-delete-crash-box): Always move the crash
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index ed311aa8881..048c0d8a022 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -301,6 +301,13 @@ this is nil, `ssl' is assumed for connexions to port
                  (const :tag "SSL/TLS" ssl)
                  (const starttls)))
 
+(eval-and-compile
+  (if (fboundp 'set-process-query-on-exit-flag)
+      (defalias 'pop3-set-process-query-on-exit-flag
+        'set-process-query-on-exit-flag)
+    (defalias 'pop3-set-process-query-on-exit-flag
+      'process-kill-without-query)))
+
 (defun pop3-open-server (mailhost port)
   "Open TCP connection to MAILHOST on PORT.
 Returns the process associated with the connection."
@@ -361,7 +368,7 @@ Returns the process associated with the connection."
         (setq pop3-timestamp
               (substring response (or (string-match "<" response) 0)
                          (+ 1 (or (string-match ">" response) -1)))))
-      (set-process-query-on-exit-flag process nil)
+      (pop3-set-process-query-on-exit-flag process nil)
       process)))
 
 ;; Support functions