[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105241: Add a variable to customize
From: |
Lars Magne Ingebrigtsen |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105241: Add a variable to customize the gnutls priority |
Date: |
Fri, 15 Jul 2011 19:21:57 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105241
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-15 19:21:57 +0200
message:
Add a variable to customize the gnutls priority
modified:
lisp/ChangeLog
lisp/emacs-lisp/cl-loaddefs.el
lisp/net/gnutls.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-07-15 17:18:53 +0000
+++ b/lisp/ChangeLog 2011-07-15 17:21:57 +0000
@@ -7,6 +7,9 @@
2011-07-15 Lars Magne Ingebrigtsen <address@hidden>
+ * net/gnutls.el (gnutls-algorithm-priority): New variable.
+ (gnutls-negotiate): Use it.
+
* emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node.
* info.el (Info-beginning-of-buffer): New command.
=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el 2011-07-15 13:55:00 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el 2011-07-15 17:21:57 +0000
@@ -282,7 +282,7 @@
;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist
;;;;;; do* do loop return-from return block etypecase typecase ecase
;;;;;; case load-time-value eval-when destructuring-bind function*
-;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el"
"dd99db1e96dff411cc5d484a639a1330")
+;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el"
"2261724608e3223036b863d214f7dc0c")
;;; Generated autoloads from cl-macs.el
(autoload 'gensym "cl-macs" "\
@@ -541,12 +541,13 @@
\(fn TYPE FORM)" nil (quote macro))
(autoload 'declare "cl-macs" "\
-Declare something about SPECS while compiling.
+Declare SPECS about the current function while compiling.
For instance
(declare (warn 0))
-will turn off byte-compile warnings.
+will turn off byte-compile warnings in the function.
+See Info node `(cl)Declarations' for details.
\(fn &rest SPECS)" nil (quote macro))
=== modified file 'lisp/net/gnutls.el'
--- a/lisp/net/gnutls.el 2011-05-04 01:44:58 +0000
+++ b/lisp/net/gnutls.el 2011-07-15 17:21:57 +0000
@@ -47,6 +47,13 @@
:type 'integer
:group 'gnutls)
+(defcustom gnutls-algorithm-priority nil
+ "If non-nil, this should be a TLS priority string.
+For instance, if you want to skip the \"dhe-rsa\" algorithm,
+set this variable to \"normal:-dhe-rsa\"."
+ :type '(choice (const nil)
+ string))
+
(defun open-gnutls-stream (name buffer host service)
"Open a SSL/TLS connection for a service to a host.
Returns a subprocess-object to represent the connection.
@@ -145,7 +152,7 @@
((eq type 'gnutls-anon)
"NORMAL:+ANON-DH:!ARCFOUR-128")
((eq type 'gnutls-x509pki)
- "NORMAL"))))
+ (or gnutls-algorithm-priority "NORMAL")))))
(params `(:priority ,priority-string
:hostname ,hostname
:loglevel ,gnutls-log-level
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105241: Add a variable to customize the gnutls priority,
Lars Magne Ingebrigtsen <=