Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 77-78)

   - Update from CVS

2005-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (article-display-x-face): Replace
   process-kill-without-query by gnus-set-process-query-on-exit-flag.

   * lisp/gnus/gnus-group.el: Bind gnus-cache-active-hashtb when compiling.

   * lisp/gnus/gnus-util.el (gnus-set-process-query-on-exit-flag): Alias to
   set-process-query-on-exit-flag or process-kill-without-query.

   * lisp/gnus/html2text.el (html2text-fix-paragraphs): Use `while - re-search'
   loop instead of replace-regexp.

   * lisp/gnus/imap.el (imap-ssl-open): Use set-process-query-on-exit-flag
   instead of process-kill-without-query if it is available.

   * lisp/gnus/mm-util.el (mm-insert-file-contents): Bind find-file-hook
   instead of find-file-hooks if it is available.

   * lisp/gnus/mml1991.el: Bind pgg-default-user-id when compiling.

   * lisp/gnus/mml2015.el: Bind pgg-default-user-id when compiling.

   * lisp/gnus/nndraft.el (nndraft-request-associate-buffer): Use
   write-contents-functions instead of write-contents-hooks if it is
   available.

   * lisp/gnus/nnheader.el (nnheader-find-file-noselect): Bind find-file-hook
   instead of find-file-hooks if it is available.

   * lisp/gnus/nntp.el (nntp-open-connection): Replace
   process-kill-without-query by gnus-set-process-query-on-exit-flag.
   (nntp-open-ssl-stream): Ditto.
   (nntp-open-tls-stream): Ditto.

   * lisp/gnus/pgg.el: Don't bind itimer vars; don't autoload itimer functions.
   (pgg-run-at-time-1): New macro.
   (pgg-run-at-time): Use it.

   * lisp/gnus/starttls.el (starttls-set-process-query-on-exit-flag): Alias to
   set-process-query-on-exit-flag or process-kill-without-query.
   (starttls-open-stream-gnutls): Use it instead of
   process-kill-without-query.
   (starttls-open-stream): Ditto.

2005-05-31  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/imap.el (imap-ssl-open): Use imap-process-connection-type,
   instead of hard coding to nil.

2005-05-31  Kevin Greiner  <kgreiner@xpediantsolutions.com>

   * lisp/gnus/gnus-group.el (): Require gnus-sum and autoload functions to
   resolve warnings when gnus-group.el compiled alone.

1 files changed, 10 insertions, 3 deletions

diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index f2b72fbef1c..7faa3a933a7 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -1,6 +1,7 @@
 ;;; starttls.el --- STARTTLS functions
 
-;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2004, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Author: Simon Josefsson <simon@josefsson.org>
@@ -235,6 +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)
+    (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,7 +253,7 @@ handshake, or NIL on failure."
 				  (int-to-string service)
 				service)
 			 starttls-extra-arguments)))
-    (process-kill-without-query process)
+    (starttls-set-process-query-on-exit-flag process nil)
     (while (and (processp process)
 		(eq (process-status process) 'run)
 		(save-excursion
@@ -286,7 +293,7 @@ specifying a port number to connect to."
 			   name buffer starttls-program
 			   host (format "%s" service)
 			   starttls-extra-args)))
-      (process-kill-without-query process)
+      (starttls-set-process-query-on-exit-flag process nil)
       process)))
 
 (provide 'starttls)