[gnus git] branch master updated: n0-15-93-g5bea28e =1= Synch with Emacs trunk.

       via  5bea28e91492789ba58df1f7d083f0d05d3d4ee9 (commit)
      from  8eff47ef26184d85116de552681c7e64b885cafc (commit)


- Log -----------------------------------------------------------------
commit 5bea28e91492789ba58df1f7d083f0d05d3d4ee9
Author: Teodor Zlatanov <[email protected]>
Date:   Mon Apr 25 04:28:40 2011 +0000

    Synch with Emacs trunk.
    
    proto-stream.el (proto-stream-open-starttls): Give host parameter to `gnutls-negotiate'.
     (gnutls-negotiate): Adjust `gnutls-negotiate' declaration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d30adb1..e37fae3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,12 @@
 	* gnus-registry.el (gnus-registry-ignore-group-p): Don't call
 	`gnus-parameter-registry-ignore' if the *Group* buffer doesn't exist.
 
+2011-04-24  Teodor Zlatanov  <[email protected]>
+
+	* proto-stream.el (proto-stream-open-starttls): Give host parameter to
+	`gnutls-negotiate'.
+	(gnutls-negotiate): Adjust `gnutls-negotiate' declaration.
+
 2011-04-23  Glenn Morris  <[email protected]>
 
 	* gnus-sum.el (gnus-extra-headers): Bump :version.
diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 0a055d0..e7718a5 100644
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -52,7 +52,8 @@
 (require 'starttls)
 
 (declare-function gnutls-negotiate "gnutls"
-		  (proc type &optional priority-string trustfiles keyfiles))
+                  (proc type host &optional priority-string trustfiles keyfiles
+                        verify-flags verify-error verify-hostname-error))
 
 ;;;###autoload
 (defun open-protocol-stream (name buffer host service &rest parameters)
@@ -186,7 +187,7 @@ PARAMETERS should be a sequence of keywords and values:
 			  (proto-stream-command stream starttls-command eoc))
 	;; The server said it was OK to begin STARTTLS negotiations.
 	(if (fboundp 'open-gnutls-stream)
-	    (gnutls-negotiate stream nil)
+	    (gnutls-negotiate stream nil host)
 	  (unless (starttls-negotiate stream)
 	    (delete-process stream)))
 	(if (memq (process-status stream) '(open run))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog       |    6 ++++++
 lisp/proto-stream.el |    5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project