[Emacs-diffs] Changes to emacs/lisp/gnus/starttls.el

[Miles Bader]

Index: emacs/lisp/gnus/starttls.el
diff -c emacs/lisp/gnus/starttls.el:1.6 emacs/lisp/gnus/starttls.el:1.7
*** emacs/lisp/gnus/starttls.el:1.6     Wed Feb  9 15:50:37 2005
--- emacs/lisp/gnus/starttls.el Wed Jun  1 05:07:06 2005
***************
*** 1,6 ****
  ;;; starttls.el --- STARTTLS functions
  
! ;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
  
  ;; Author: Daiki Ueno <address@hidden>
  ;; Author: Simon Josefsson <address@hidden>
--- 1,7 ----
  ;;; starttls.el --- STARTTLS functions
  
! ;; Copyright (C) 1999, 2000, 2003, 2004, 2005
! ;;        Free Software Foundation, Inc.
  
  ;; Author: Daiki Ueno <address@hidden>
  ;; Author: Simon Josefsson <address@hidden>
***************
*** 235,240 ****
--- 236,247 ----
        (starttls-negotiate-gnutls process)
      (signal-process (process-id process) 'SIGALRM)))
  
+ (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
+     'process-kill-without-query))
+ 
  (defun starttls-open-stream-gnutls (name buffer host service)
    (message "Opening STARTTLS connection to `%s'..." host)
    (let* (done
***************
*** 246,252 ****
                                  (int-to-string service)
                                service)
                         starttls-extra-arguments)))
!     (process-kill-without-query process)
      (while (and (processp process)
                (eq (process-status process) 'run)
                (save-excursion
--- 253,259 ----
                                  (int-to-string service)
                                service)
                         starttls-extra-arguments)))
!     (starttls-set-process-query-on-exit-flag process nil)
      (while (and (processp process)
                (eq (process-status process) 'run)
                (save-excursion
***************
*** 286,292 ****
                           name buffer starttls-program
                           host (format "%s" service)
                           starttls-extra-args)))
!       (process-kill-without-query process)
        process)))
  
  (provide 'starttls)
--- 293,299 ----
                           name buffer starttls-program
                           host (format "%s" service)
                           starttls-extra-args)))
!       (starttls-set-process-query-on-exit-flag process nil)
        process)))
  
  (provide 'starttls)