[Emacs-diffs] /srv/bzr/emacs/trunk r111690: * coding.c (Fdefine_coding_system_internal): Use AREF where

[Dmitry Antipov]

------------------------------------------------------------
revno: 111690
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-02-07 20:09:04 +0400
message:
  * coding.c (Fdefine_coding_system_internal): Use AREF where
  argument is known to be a vector.
  * fns.c (Flocale_info): Likewise for ASET.
  * xselect.c (selection_data_to_lisp_data): Likewise for ASET.
  * w32fns.c (w32_parse_hot_key): Likewise for ASIZE and AREF.
modified:
  src/ChangeLog
  src/coding.c
  src/fns.c
  src/w32fns.c
  src/xselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-07 06:23:54 +0000
+++ b/src/ChangeLog     2013-02-07 16:09:04 +0000
@@ -1,3 +1,11 @@
+2013-02-07  Dmitry Antipov  <address@hidden>
+
+       * coding.c (Fdefine_coding_system_internal): Use AREF where
+       argument is known to be a vector.
+       * fns.c (Flocale_info): Likewise for ASET.
+       * xselect.c (selection_data_to_lisp_data): Likewise for ASET.
+       * w32fns.c (w32_parse_hot_key): Likewise for ASIZE and AREF.
+
 2013-02-05  Jan Djärv  <address@hidden>
 
        * nsmenu.m (update_frame_tool_bar): Check for negative tool bar

=== modified file 'src/coding.c'
--- a/src/coding.c      2013-01-25 04:41:39 +0000
+++ b/src/coding.c      2013-02-07 16:09:04 +0000
@@ -9783,7 +9783,7 @@
       CHECK_VECTOR (initial);
       for (i = 0; i < 4; i++)
        {
-         val = Faref (initial, make_number (i));
+         val = AREF (initial, i);
          if (! NILP (val))
            {
              struct charset *charset;

=== modified file 'src/fns.c'
--- a/src/fns.c 2013-01-23 20:07:28 +0000
+++ b/src/fns.c 2013-02-07 16:09:04 +0000
@@ -2807,9 +2807,8 @@
          val = build_unibyte_string (str);
          /* Fixme: Is this coding system necessarily right, even if
             it is consistent with CODESET?  If not, what to do?  */
-         Faset (v, make_number (i),
-                code_convert_string_norecord (val, Vlocale_coding_system,
-                                              0));
+         ASET (v, i, code_convert_string_norecord (val, Vlocale_coding_system,
+                                                   0));
        }
       UNGCPRO;
       return v;
@@ -2829,8 +2828,8 @@
        {
          str = nl_langinfo (months[i]);
          val = build_unibyte_string (str);
-         Faset (v, make_number (i),
-                code_convert_string_norecord (val, Vlocale_coding_system, 0));
+         ASET (v, i, code_convert_string_norecord (val, Vlocale_coding_system,
+                                                   0));
        }
       UNGCPRO;
       return v;

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2013-02-02 17:14:24 +0000
+++ b/src/w32fns.c      2013-02-07 16:09:04 +0000
@@ -6484,12 +6484,12 @@
 
   CHECK_VECTOR (key);
 
-  if (XFASTINT (Flength (key)) != 1)
+  if (ASIZE (key) != 1)
     return Qnil;
 
   GCPRO1 (key);
 
-  c = Faref (key, make_number (0));
+  c = AREF (key, 0);
 
   if (CONSP (c) && lucid_event_type_list_p (c))
     c = Fevent_convert_list (c);

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2013-01-17 06:29:40 +0000
+++ b/src/xselect.c     2013-02-07 16:09:04 +0000
@@ -1673,8 +1673,7 @@
          Lisp_Object v = Fmake_vector (make_number (size / sizeof (int)),
                                        make_number (0));
          for (i = 0; i < size / sizeof (int); i++)
-           Faset (v, make_number (i),
-                   x_atom_to_symbol (display, (Atom) idata[i]));
+           ASET (v, i, x_atom_to_symbol (display, (Atom) idata[i]));
          return v;
        }
     }
@@ -1699,7 +1698,7 @@
       for (i = 0; i < size / 2; i++)
        {
          short j = ((short *) data) [i];
-         Faset (v, make_number (i), make_number (j));
+         ASET (v, i, make_number (j));
        }
       return v;
     }
@@ -1711,7 +1710,7 @@
       for (i = 0; i < size / X_LONG_SIZE; i++)
        {
          int j = ((int *) data) [i];
-         Faset (v, make_number (i), INTEGER_TO_CONS (j));
+         ASET (v, i, INTEGER_TO_CONS (j));
        }
       return v;
     }