diff options
| author | Glenn Morris | 2010-10-31 22:53:15 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-31 22:53:15 -0700 |
| commit | c3dfebd1284d18f0e075074b9570d653b7369239 (patch) | |
| tree | fb7e38be02dfea3fb716b52db49630224d78c113 | |
| parent | 28886d5eaaf0c91a4507b95edf23317ed4c6fa90 (diff) | |
| download | emacs-c3dfebd1284d18f0e075074b9570d653b7369239.tar.gz emacs-c3dfebd1284d18f0e075074b9570d653b7369239.zip | |
* net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): Declare.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2d508987c6b..fa0075fe769 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-11-01 Glenn Morris <rgm@gnu.org> | 1 | 2010-11-01 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): | ||
| 4 | Declare. | ||
| 5 | |||
| 3 | * info.el (finder-keywords-hash, package-alist): Declare. | 6 | * info.el (finder-keywords-hash, package-alist): Declare. |
| 4 | 7 | ||
| 5 | 2010-11-01 Chong Yidong <cyd@stupidchicken.com> | 8 | 2010-11-01 Chong Yidong <cyd@stupidchicken.com> |
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 00cdcd8ea9b..85c546ffd3f 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | ;;; gnutls.el --- Support SSL/TLS connections through GnuTLS | 1 | ;;; gnutls.el --- Support SSL/TLS connections through GnuTLS |
| 2 | |||
| 2 | ;; Copyright (C) 2010 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010 Free Software Foundation, Inc. |
| 3 | 4 | ||
| 4 | ;; Author: Ted Zlatanov <tzz@lifelogs.com> | 5 | ;; Author: Ted Zlatanov <tzz@lifelogs.com> |
| @@ -65,6 +66,8 @@ trust and key files, and priority string." | |||
| 65 | (let ((proc (open-network-stream name buffer host service))) | 66 | (let ((proc (open-network-stream name buffer host service))) |
| 66 | (gnutls-negotiate proc 'gnutls-x509pki))) | 67 | (gnutls-negotiate proc 'gnutls-x509pki))) |
| 67 | 68 | ||
| 69 | (declare-function gnutls-boot "gnutls.c" (proc type proplist)) | ||
| 70 | |||
| 68 | (defun gnutls-negotiate (proc type &optional priority-string | 71 | (defun gnutls-negotiate (proc type &optional priority-string |
| 69 | trustfiles keyfiles) | 72 | trustfiles keyfiles) |
| 70 | "Negotiate a SSL/TLS connection. | 73 | "Negotiate a SSL/TLS connection. |
| @@ -95,6 +98,9 @@ KEYFILES is a list of client keys." | |||
| 95 | 98 | ||
| 96 | proc)) | 99 | proc)) |
| 97 | 100 | ||
| 101 | (declare-function gnutls-errorp "gnutls.c" (error)) | ||
| 102 | (declare-function gnutls-error-string "gnutls.c" (error)) | ||
| 103 | |||
| 98 | (defun gnutls-message-maybe (doit format &rest params) | 104 | (defun gnutls-message-maybe (doit format &rest params) |
| 99 | "When DOIT, message with the caller name followed by FORMAT on PARAMS." | 105 | "When DOIT, message with the caller name followed by FORMAT on PARAMS." |
| 100 | ;; (apply 'debug format (or params '(nil))) | 106 | ;; (apply 'debug format (or params '(nil))) |