Synch to No Gnus 200407280756.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 732f398..45bbeb2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-28  Simon Josefsson  <jas@extundo.com>
+
+       * pgg-pgp5.el (pgg-pgp5-encrypt-region): Accept sign
+       parameter (but don't use it, for now).
+
+       * imap.el (imap-ssl-open): Use imap-process-connection-type,
+       instead of hard coding to nil.
+
 2004-07-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-view.el (mm-inline-image-emacs): Open lines under an image

diff --git a/lisp/imap.el b/lisp/imap.el
index 135c0c0..5e53259 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -625,7 +625,7 @@ sure of changing the value of `foo'."
       (message "imap: Opening SSL connection with `%s'..." cmd)
       (erase-buffer)
       (let ((port (or port imap-default-ssl-port))
-           (process-connection-type nil)
+           (process-connection-type imap-process-connection-type)
            process)
        (when (prog1
                  (setq process (as-binary-process