aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Zlatanov2013-12-23 07:51:51 -0500
committerTed Zlatanov2013-12-23 07:51:51 -0500
commitb90aa4f440da6328f0a0930aa7368a6d0c7bbe60 (patch)
tree288639240190378e4fdeaa974fb8cb962bc24a48
parenta0f20f21e08af104e9e95498ea00b23059e3b056 (diff)
downloademacs-b90aa4f440da6328f0a0930aa7368a6d0c7bbe60.tar.gz
emacs-b90aa4f440da6328f0a0930aa7368a6d0c7bbe60.zip
net/gnutls.el (gnutls-verify-error): Add version tag.
* net/gnutls.el (gnutls-verify-error): Add version tag.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/gnutls.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 963fd58dbed..6422f4416c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-12-23 Teodor Zlatanov <tzz@lifelogs.com>
2
3 * net/gnutls.el (gnutls-verify-error): Add version tag.
4
12013-12-23 Chong Yidong <cyd@gnu.org> 52013-12-23 Chong Yidong <cyd@gnu.org>
2 6
3 * subr.el (set-transient-map): Rename from 7 * subr.el (set-transient-map): Rename from
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index e9ba6288b6f..6153c084a4a 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -54,6 +54,7 @@ set this variable to \"normal:-dhe-rsa\"."
54(defcustom gnutls-verify-error nil 54(defcustom gnutls-verify-error nil
55 "If non-nil, this should be a list of checks per hostname regex or t." 55 "If non-nil, this should be a list of checks per hostname regex or t."
56 :group 'gnutls 56 :group 'gnutls
57 :version "24.4"
57 :type '(choice 58 :type '(choice
58 (const t) 59 (const t)
59 (repeat :tag "List of hostname regexps with flags for each" 60 (repeat :tag "List of hostname regexps with flags for each"