diff options
| author | Glenn Morris | 2013-09-17 21:50:54 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-09-17 21:50:54 -0700 |
| commit | ffb82dbda37f51c7a997fee74646e94647effad5 (patch) | |
| tree | 5304ca5bbf4373ee721db1a74015a7c741e1683a /lisp | |
| parent | 5148da153e385332f3fc87ace4bf4c2fc580b41e (diff) | |
| download | emacs-ffb82dbda37f51c7a997fee74646e94647effad5.tar.gz emacs-ffb82dbda37f51c7a997fee74646e94647effad5.zip | |
* net/gnutls.el (gnutls-log-level): Declare.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96f2702f984..3de40545779 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | 31 | ||
| 32 | * frame.el (x-display-grayscale-p, x-display-name): Declare. | 32 | * frame.el (x-display-grayscale-p, x-display-name): Declare. |
| 33 | 33 | ||
| 34 | * net/gnutls.el (gnutls-log-level): Declare. | ||
| 35 | |||
| 34 | * simple.el (font-info): Declare. | 36 | * simple.el (font-info): Declare. |
| 35 | 37 | ||
| 36 | * subr.el (x-popup-dialog): Declare. | 38 | * subr.el (x-popup-dialog): Declare. |
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 37755806616..923b108c708 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el | |||
| @@ -115,6 +115,7 @@ trust and key files, and priority string." | |||
| 115 | 115 | ||
| 116 | (declare-function gnutls-boot "gnutls.c" (proc type proplist)) | 116 | (declare-function gnutls-boot "gnutls.c" (proc type proplist)) |
| 117 | (declare-function gnutls-errorp "gnutls.c" (error)) | 117 | (declare-function gnutls-errorp "gnutls.c" (error)) |
| 118 | (defvar gnutls-log-level) ; gnutls.c | ||
| 118 | 119 | ||
| 119 | (cl-defun gnutls-negotiate | 120 | (cl-defun gnutls-negotiate |
| 120 | (&rest spec | 121 | (&rest spec |