aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-04-16 15:16:40 -0400
committerEli Zaretskii2011-04-16 15:16:40 -0400
commitc4354cb4f4a3982331180439120ca72734d49cc5 (patch)
treef049af3297aef4df7971d3973de3ec7cd96f5c95 /src
parentd1dfb56cc84a6d70262d979face230a71e98d479 (diff)
downloademacs-c4354cb4f4a3982331180439120ca72734d49cc5.tar.gz
emacs-c4354cb4f4a3982331180439120ca72734d49cc5.zip
Fix argument to `error' in `gnutls-boot'.
src/gnutls.c (Fgnutls_boot): Don't pass Lisp_Object to `error'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gnutls.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e8b82ec3be3..d9f764cde85 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-16 Eli Zaretskii <eliz@gnu.org> 12011-04-16 Eli Zaretskii <eliz@gnu.org>
2 2
3 * gnutls.c (Fgnutls_boot): Don't pass Lisp_Object to `error'.
4
3 Fix regex.c, syntax.c and friends for buffers > 2GB. 5 Fix regex.c, syntax.c and friends for buffers > 2GB.
4 * syntax.h (struct gl_state_s): Declare character position members 6 * syntax.h (struct gl_state_s): Declare character position members
5 EMACS_INT. 7 EMACS_INT.
diff --git a/src/gnutls.c b/src/gnutls.c
index d7328e114c7..f4f2b9bbd35 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -456,7 +456,7 @@ one trustfile (usually a CA bundle). */)
456 else 456 else
457 { 457 {
458 error ("Sorry, GnuTLS can't use non-string trustfile %s", 458 error ("Sorry, GnuTLS can't use non-string trustfile %s",
459 trustfile); 459 SDATA (trustfile));
460 } 460 }
461 } 461 }
462 462
@@ -478,7 +478,7 @@ one trustfile (usually a CA bundle). */)
478 else 478 else
479 { 479 {
480 error ("Sorry, GnuTLS can't use non-string keyfile %s", 480 error ("Sorry, GnuTLS can't use non-string keyfile %s",
481 keyfile); 481 SDATA (keyfile));
482 } 482 }
483 } 483 }
484 } 484 }