Fix handling of face attributes in Fx_create_frame (Bug#16529).

[gnu-emacs] / src / gnutls.c

diff --git a/src/gnutls.c b/src/gnutls.c
index a14d3ef31c5cc7b40602c98299ea34f857219f8c..dd975b160cd1c4629a730f675b5c562ddc117670 100644 (file)
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1,5 +1,5 @@
 /* GnuTLS glue for GNU Emacs.
-   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -825,7 +825,7 @@ one trustfile (usually a CA bundle).  */)
   verify_error          = Fplist_get (proplist, QCgnutls_bootprop_verify_error);
   prime_bits            = Fplist_get (proplist, QCgnutls_bootprop_min_prime_bits);
 
-  if (!Flistp (verify_error))
+  if (NILP (Flistp (verify_error)))
     error ("gnutls-boot: invalid :verify_error parameter (not a list)");
 
   if (!STRINGP (hostname))
@@ -1071,8 +1071,7 @@ one trustfile (usually a CA bundle).  */)
 
   if (peer_verification != 0)
     {
-      if (EQ (verify_error, Qt)
-          || !NILP (Fmember (QCgnutls_bootprop_trustfiles, verify_error)))
+      if (!NILP (Fmember (QCgnutls_bootprop_trustfiles, verify_error)))
         {
          emacs_gnutls_deinit (proc);
          error ("Certificate validation failed %s, verification code %d",
@@ -1121,8 +1120,7 @@ one trustfile (usually a CA bundle).  */)
 
       if (!fn_gnutls_x509_crt_check_hostname (gnutls_verify_cert, c_hostname))
        {
-          if (EQ (verify_error, Qt)
-              || !NILP (Fmember (QCgnutls_bootprop_hostname, verify_error)))
+          if (!NILP (Fmember (QCgnutls_bootprop_hostname, verify_error)))
             {
              fn_gnutls_x509_crt_deinit (gnutls_verify_cert);
              emacs_gnutls_deinit (proc);