[Emacs-diffs] /srv/bzr/emacs/trunk r105242: * net/gnutls.el (gnutls-negotiate): Upcase `gnutls-algorithm-priority'.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105242
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-15 19:25:02 +0200
message:
  * net/gnutls.el (gnutls-negotiate): Upcase `gnutls-algorithm-priority'.
modified:
  lisp/ChangeLog
  lisp/net/gnutls.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-15 17:21:57 +0000
+++ b/lisp/ChangeLog    2011-07-15 17:25:02 +0000
@@ -1,3 +1,8 @@
+2011-07-15  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/gnutls.el (gnutls-negotiate): Upcase
+       `gnutls-algorithm-priority'.
+
 2011-07-15  Glenn Morris  <address@hidden>
 
        * jka-compr.el (jka-compr-verbose): Move from here...

=== modified file 'lisp/net/gnutls.el'
--- a/lisp/net/gnutls.el        2011-07-15 17:21:57 +0000
+++ b/lisp/net/gnutls.el        2011-07-15 17:25:02 +0000
@@ -152,7 +152,9 @@
                                ((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