From: Andreas Schwab Date: Wed, 11 Jul 2012 07:20:14 +0000 (+0200) Subject: * gnutls.c (Fgnutls_boot): Properly parse :keylist argument. X-Git-Tag: emacs-24.2.90~1199^2~65 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d96a1e0c71d99aafcde25a700c310220c4e0c5de;p=emacs.git * gnutls.c (Fgnutls_boot): Properly parse :keylist argument. --- diff --git a/src/ChangeLog b/src/ChangeLog index 0ca6c0594a8..b323a876334 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2012-07-11 Andreas Schwab + * gnutls.c (Fgnutls_boot): Properly parse :keylist argument. + * coding.c (Fdefine_coding_system_internal): Use XCAR/XCDR instead of Fcar/Fcdr if possible. * font.c (check_otf_features): Likewise. diff --git a/src/gnutls.c b/src/gnutls.c index ad569e98226..9895936c246 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -916,7 +916,7 @@ one trustfile (usually a CA bundle). */) for (tail = keylist; CONSP (tail); tail = XCDR (tail)) { Lisp_Object keyfile = Fcar (XCAR (tail)); - Lisp_Object certfile = Fcar (XCDR (tail)); + Lisp_Object certfile = Fcar (Fcdr (XCAR (tail))); if (STRINGP (keyfile) && STRINGP (certfile)) { GNUTLS_LOG2 (1, max_log_level, "setting the client key file: ",