diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-17 00:49:20 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-17 00:49:20 +0200 |
| commit | 750c33f71e7281e651f7315689f9085a1d0894d7 (patch) | |
| tree | a473a0cd2af2f03d570a71bc6d3aa7650f80c84b /lisp | |
| parent | a80314570479945eb610a4f3f30fd6e82100195d (diff) | |
| download | emacs-750c33f71e7281e651f7315689f9085a1d0894d7.tar.gz emacs-750c33f71e7281e651f7315689f9085a1d0894d7.tar.bz2 emacs-750c33f71e7281e651f7315689f9085a1d0894d7.zip | |
Move the defintion of `gnutls-log-level' to the C level to avoid loading problems
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 186917010ab..15f742ed91a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-07-16 Lars Magne Ingebrigtsen <larsi@gnus.org> + * net/gnutls.el (gnutls-log-level): Removed. + * textmodes/fill.el (adaptive-fill-regexp): Include EN DASH as an indentation character (bug#6380). diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index edbf9a54afc..9cb071b185d 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -42,11 +42,6 @@ :prefix "gnutls-" :group 'net-utils) -(defcustom gnutls-log-level 0 - "Logging level to be used by `starttls-negotiate' and GnuTLS." - :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, |