[Emacs-diffs] /srv/bzr/emacs/trunk r109021: * coding.c (Fdefine_coding_system_internal): Use XCAR/XCDR instead

[Andreas Schwab]

------------------------------------------------------------
revno: 109021
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Wed 2012-07-11 09:19:44 +0200
message:
  * 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.
modified:
  src/ChangeLog
  src/coding.c
  src/font.c
  src/fontset.c
  src/gnutls.c
  src/minibuf.c
  src/msdos.c
  src/w32menu.c
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-11 07:07:19 +0000
+++ b/src/ChangeLog     2012-07-11 07:19:44 +0000
@@ -1,3 +1,15 @@
+2012-07-11  Andreas Schwab  <address@hidden>
+
+       * 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.
+
 2012-07-11  Glenn Morris  <address@hidden>
 
        * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h:

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-07-10 16:53:26 +0000
+++ b/src/coding.c      2012-07-11 07:19:44 +0000
@@ -9795,7 +9795,7 @@
        {
          int from, to;
 
-         val = Fcar (tail);
+         val = XCAR (tail);
          if (INTEGERP (val))
            {
              if (! (0 <= XINT (val) && XINT (val) <= 255))
@@ -9897,7 +9897,7 @@
          int id;
          Lisp_Object tmp1;
 
-         val = Fcar (tail);
+         val = XCAR (tail);
          CHECK_CONS (val);
          tmp1 = XCAR (val);
          CHECK_CHARSET_GET_ID (tmp1, id);

=== modified file 'src/font.c'
--- a/src/font.c        2012-07-11 06:14:19 +0000
+++ b/src/font.c        2012-07-11 07:19:44 +0000
@@ -1827,7 +1827,7 @@
   otf_features = XCDR (otf_features);
   for (val = Fcar (otf_features); CONSP (val); val = XCDR (val))
     {
-      CHECK_SYMBOL (Fcar (val));
+      CHECK_SYMBOL (XCAR (val));
       if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
        error ("Invalid OTF GSUB feature: %s",
               SDATA (SYMBOL_NAME (XCAR (val))));
@@ -1835,7 +1835,7 @@
   otf_features = XCDR (otf_features);
   for (val = Fcar (otf_features); CONSP (val); val = XCDR (val))
     {
-      CHECK_SYMBOL (Fcar (val));
+      CHECK_SYMBOL (XCAR (val));
       if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
        error ("Invalid OTF GPOS feature: %s",
               SDATA (SYMBOL_NAME (XCAR (val))));

=== modified file 'src/fontset.c'
--- a/src/fontset.c     2012-07-11 04:31:53 +0000
+++ b/src/fontset.c     2012-07-11 07:19:44 +0000
@@ -1672,7 +1672,7 @@
     {
       Lisp_Object elt, script;
 
-      elt = Fcar (fontlist);
+      elt = XCAR (fontlist);
       script = Fcar (elt);
       elt = Fcdr (elt);
       if (CONSP (elt) && (NILP (XCDR (elt)) || CONSP (XCDR (elt))))

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2012-07-10 16:53:26 +0000
+++ b/src/gnutls.c      2012-07-11 07:19:44 +0000
@@ -873,7 +873,7 @@
 
       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 @@
 
       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 @@
 
       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: ",

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2012-07-10 16:53:26 +0000
+++ b/src/minibuf.c     2012-07-11 07:19:44 +0000
@@ -424,7 +424,7 @@
     {
       if (CONSP (initial))
        {
-         Lisp_Object backup_n = Fcdr (initial);
+         Lisp_Object backup_n = XCDR (initial);
          initial = XCAR (initial);
          CHECK_STRING (initial);
          if (!NILP (backup_n))

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2012-07-10 23:24:36 +0000
+++ b/src/msdos.c       2012-07-11 07:19:44 +0000
@@ -1620,9 +1620,7 @@
   i = 0;
   for (tail = alist; CONSP (tail); tail = XCDR (tail))
     {
-      Lisp_Object elt;
-
-      elt = Fcar (tail);
+      Lisp_Object elt = XCAR (tail);
       parms[i] = Fcar (elt);
       CHECK_SYMBOL (parms[i]);
       values[i] = Fcdr (elt);

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2012-07-10 16:53:26 +0000
+++ b/src/w32menu.c     2012-07-11 07:19:44 +0000
@@ -164,10 +164,10 @@
     {
       Lisp_Object tem = XCAR (position);
       if (CONSP (tem))
-       window = Fcar (Fcdr (position));
+       window = Fcar (XCDR (position));
       else
        {
-         tem = Fcar (Fcdr (position));  /* EVENT_START (position) */
+         tem = Fcar (XCDR (position));  /* EVENT_START (position) */
          window = Fcar (tem);       /* POSN_WINDOW (tem) */
        }
     }

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2012-07-10 16:53:26 +0000
+++ b/src/xmenu.c       2012-07-11 07:19:44 +0000
@@ -260,10 +260,10 @@
     {
       Lisp_Object tem = XCAR (position);
       if (CONSP (tem))
-       window = Fcar (Fcdr (position));
+       window = Fcar (XCDR (position));
       else
        {
-         tem = Fcar (Fcdr (position));  /* EVENT_START (position) */
+         tem = Fcar (XCDR (position));  /* EVENT_START (position) */
          window = Fcar (tem);       /* POSN_WINDOW (tem) */
        }
     }