From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Fri, 15 Jul 2011 17:25:02 +0000 (+0200)
Subject: * net/gnutls.el (gnutls-negotiate): Upcase `gnutls-algorithm-priority'.
X-Git-Tag: emacs-pretest-24.0.90~104^2~239
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6066239555e3ef3fcda8481ce9f9288676b1bd8;p=emacs.git

* net/gnutls.el (gnutls-negotiate): Upcase `gnutls-algorithm-priority'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 114a318fe96..87f5cc9d70d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/gnutls.el (gnutls-negotiate): Upcase
+	`gnutls-algorithm-priority'.
+
 2011-07-15  Glenn Morris  <rgm@gnu.org>
 
 	* jka-compr.el (jka-compr-verbose): Move from here...
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index f0bc8dec09d..14d4a2f28e6 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -152,7 +152,9 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
                                ((eq type 'gnutls-anon)
                                 "NORMAL:+ANON-DH:!ARCFOUR-128")
                                ((eq type 'gnutls-x509pki)
-                                (or gnutls-algorithm-priority "NORMAL")))))
+				(if gnutls-algorithm-priority
+				    (upcase gnutls-algorithm-priority)
+				  "NORMAL")))))
          (params `(:priority ,priority-string
                              :hostname ,hostname
                              :loglevel ,gnutls-log-level