aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorTed Zlatanov2014-11-25 11:45:20 -0500
committerTed Zlatanov2014-11-25 11:45:36 -0500
commitc8a2d631966f6a9569d68a3ac08c186d044e3a88 (patch)
tree83972638933435ec6569e5dd28bc947381619921 /lisp
parent7dbd10d530f9c5688ad76e5ddabf53e3cd5579cf (diff)
downloademacs-c8a2d631966f6a9569d68a3ac08c186d044e3a88.tar.gz
emacs-c8a2d631966f6a9569d68a3ac08c186d044e3a88.zip
* net/gnutls.el (gnutls): Set :group to 'comm so it's near NSM.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/net/gnutls.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fb12913441..19ef782932b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,8 @@
7 7
82014-11-25 Teodor Zlatanov <tzz@lifelogs.com> 82014-11-25 Teodor Zlatanov <tzz@lifelogs.com>
9 9
10 * net/gnutls.el (gnutls): Set :group to 'comm so it's near NSM.
11
10 * net/nsm.el (nsm-check-tls-connection, nsm-save-host) 12 * net/nsm.el (nsm-check-tls-connection, nsm-save-host)
11 (nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'. 13 (nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'.
12 14
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 3ad92c4607a..cf8e6a48cb4 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -41,7 +41,7 @@
41 "Emacs interface to the GnuTLS library." 41 "Emacs interface to the GnuTLS library."
42 :version "24.1" 42 :version "24.1"
43 :prefix "gnutls-" 43 :prefix "gnutls-"
44 :group 'net-utils) 44 :group 'comm)
45 45
46(defcustom gnutls-algorithm-priority nil 46(defcustom gnutls-algorithm-priority nil
47 "If non-nil, this should be a TLS priority string. 47 "If non-nil, this should be a TLS priority string.