* spam-report.el (spam-report-gmane-ham): Renamed from

[gnus] / lisp / starttls.el

diff --git a/lisp/starttls.el b/lisp/starttls.el
index 7faa3a9..6746439 100644 (file)
--- a/lisp/starttls.el
+++ b/lisp/starttls.el
@@ -1,7 +1,7 @@
 ;;; starttls.el --- STARTTLS functions
 
-;; Copyright (C) 1999, 2000, 2003, 2004, 2005
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Author: Simon Josefsson <simon@josefsson.org>
@@ -22,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -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)