aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/gnutls.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5cee6b4d5c2..a078c43cd6c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-02-12 Teodor Zlatanov <tzz@lifelogs.com>
2
3 * net/gnutls.el (gnutls-algorithm-priority): Add missing :group
4 tag.
5
12012-02-12 Alan Mackenzie <acm@muc.de> 62012-02-12 Alan Mackenzie <acm@muc.de>
2 7
3 Fix infinite loop with long macros. 8 Fix infinite loop with long macros.
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index f53afa90993..5f1cb65782e 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -47,6 +47,7 @@
47 "If non-nil, this should be a TLS priority string. 47 "If non-nil, this should be a TLS priority string.
48For instance, if you want to skip the \"dhe-rsa\" algorithm, 48For instance, if you want to skip the \"dhe-rsa\" algorithm,
49set this variable to \"normal:-dhe-rsa\"." 49set this variable to \"normal:-dhe-rsa\"."
50 :group 'gnutls
50 :type '(choice (const nil) 51 :type '(choice (const nil)
51 string)) 52 string))
52 53