aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-04-25 15:47:23 +0200
committerJuanma Barranquero2011-04-25 15:47:23 +0200
commitcd22b309b432f65d0191e46a7677e0d9c11ea9fd (patch)
tree1f9500df09832a2b8c991f8621f19f21bf423b51
parent42ce4c631e0d9291399dac0e9787ce2fbb97c8eb (diff)
downloademacs-cd22b309b432f65d0191e46a7677e0d9c11ea9fd.tar.gz
emacs-cd22b309b432f65d0191e46a7677e0d9c11ea9fd.zip
lisp/net/gnutls.el (gnutls-errorp): Declare before first use.
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/net/gnutls.el2
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4e28b61586..917fe6cf40a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,13 @@
12011-04-25 Juanma Barranquero <lekktu@gmail.com>
2
3 * net/gnutls.el (gnutls-errorp): Declare before first use.
4
12011-04-24 Teodor Zlatanov <tzz@lifelogs.com> 52011-04-24 Teodor Zlatanov <tzz@lifelogs.com>
2 6
3 * net/gnutls.el (gnutls-negotiate): Add hostname, verify-flags, 7 * net/gnutls.el (gnutls-negotiate): Add hostname, verify-flags,
4 verify-error, and verify-hostname-error parameters. Check whether 8 verify-error, and verify-hostname-error parameters. Check whether
5 default trustfile exists before going to use it. Add missing 9 default trustfile exists before going to use it. Add missing
6 argument to gnutls-message-maybe call. Return return value. 10 argument to gnutls-message-maybe call. Return return value.
7 Reported by Claudio Bley <claudio.bley@gmail.com>. 11 Reported by Claudio Bley <claudio.bley@gmail.com>.
8 (open-gnutls-stream): Add usage example. 12 (open-gnutls-stream): Add usage example.
9 13
@@ -13,8 +17,8 @@
13 17
142011-04-24 Daniel Colascione <dan.colascione@gmail.com> 182011-04-24 Daniel Colascione <dan.colascione@gmail.com>
15 19
16 * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use 20 * progmodes/cc-engine.el (c-forward-decl-or-cast-1):
17 correct match group (bug#8438). 21 Use correct match group (bug#8438).
18 22
192011-04-24 Chong Yidong <cyd@stupidchicken.com> 232011-04-24 Chong Yidong <cyd@stupidchicken.com>
20 24
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 46c20e6b344..8b662795665 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -83,6 +83,7 @@ trust and key files, and priority string."
83 'error-message "GnuTLS error") 83 'error-message "GnuTLS error")
84 84
85(declare-function gnutls-boot "gnutls.c" (proc type proplist)) 85(declare-function gnutls-boot "gnutls.c" (proc type proplist))
86(declare-function gnutls-errorp "gnutls.c" (error))
86 87
87(defun gnutls-negotiate (proc type hostname &optional priority-string 88(defun gnutls-negotiate (proc type hostname &optional priority-string
88 trustfiles keyfiles verify-flags 89 trustfiles keyfiles verify-flags
@@ -157,7 +158,6 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
157 158
158 proc)) 159 proc))
159 160
160(declare-function gnutls-errorp "gnutls.c" (error))
161(declare-function gnutls-error-string "gnutls.c" (error)) 161(declare-function gnutls-error-string "gnutls.c" (error))
162 162
163(defun gnutls-message-maybe (doit format &rest params) 163(defun gnutls-message-maybe (doit format &rest params)