* coding.c (Fdefine_coding_system_internal): Use XCAR/XCDR instead

of Fcar/Fcdr if possible.
* font.c (check_otf_features): Likewise.
* fontset.c (Fnew_fontset): Likewise.
* gnutls.c (Fgnutls_boot): Likewise.
* minibuf.c (read_minibuf): Likewise.
* msdos.c (IT_set_frame_parameters): Likewise.
* xmenu.c (Fx_popup_dialog): Likewise.
* w32menu.c (Fx_popup_dialog): Likewise.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gnutls.c b/src/gnutls.c
index 21658a1bc82..ad569e98226 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -873,7 +873,7 @@ one trustfile (usually a CA bundle).  */)
 
       for (tail = trustfiles; CONSP (tail); tail = XCDR (tail))
         {
-          Lisp_Object trustfile = Fcar (tail);
+          Lisp_Object trustfile = XCAR (tail);
           if (STRINGP (trustfile))
             {
               GNUTLS_LOG2 (1, max_log_level, "setting the trustfile: ",
@@ -895,7 +895,7 @@ one trustfile (usually a CA bundle).  */)
 
       for (tail = crlfiles; CONSP (tail); tail = XCDR (tail))
         {
-          Lisp_Object crlfile = Fcar (tail);
+          Lisp_Object crlfile = XCAR (tail);
           if (STRINGP (crlfile))
             {
               GNUTLS_LOG2 (1, max_log_level, "setting the CRL file: ",
@@ -915,8 +915,8 @@ one trustfile (usually a CA bundle).  */)
 
       for (tail = keylist; CONSP (tail); tail = XCDR (tail))
         {
-          Lisp_Object keyfile = Fcar (Fcar (tail));
-          Lisp_Object certfile = Fcar (Fcdr (tail));
+          Lisp_Object keyfile = Fcar (XCAR (tail));
+          Lisp_Object certfile = Fcar (XCDR (tail));
           if (STRINGP (keyfile) && STRINGP (certfile))
             {
               GNUTLS_LOG2 (1, max_log_level, "setting the client key file: ",