[Emacs-diffs] Changes to emacs/src/fns.c

[Stefan Monnier]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.314 emacs/src/fns.c:1.315
*** emacs/src/fns.c:1.314       Wed Jun  5 13:47:50 2002
--- emacs/src/fns.c     Sun Jul  7 16:57:25 2002
***************
*** 2742,2748 ****
        while (CONSP (tem))
        {
          tail = tem;
!         tem = Fcdr (tail);
          QUIT;
        }
  
--- 2742,2748 ----
        while (CONSP (tem))
        {
          tail = tem;
!         tem = XCDR (tail);
          QUIT;
        }
  
***************
*** 3206,3213 ****
  
    /* Run any load-hooks for this file.  */
    tem = Fassq (feature, Vafter_load_alist);
!   if (!NILP (tem))
!     Fprogn (Fcdr (tem));
  
    return feature;
  }
--- 3206,3213 ----
  
    /* Run any load-hooks for this file.  */
    tem = Fassq (feature, Vafter_load_alist);
!   if (CONSP (tem))
!     Fprogn (XCDR (tem));
  
    return feature;
  }
***************
*** 3896,3927 ****
     if a `:linear-search t' argument is given to make-hash-table.  */
  
  
- /* Value is the key part of entry IDX in hash table H.  */
- 
- #define HASH_KEY(H, IDX)   AREF ((H)->key_and_value, 2 * (IDX))
- 
- /* Value is the value part of entry IDX in hash table H.  */
- 
- #define HASH_VALUE(H, IDX) AREF ((H)->key_and_value, 2 * (IDX) + 1)
- 
- /* Value is the index of the next entry following the one at IDX
-    in hash table H.  */
- 
- #define HASH_NEXT(H, IDX)  AREF ((H)->next, (IDX))
- 
- /* Value is the hash code computed for entry IDX in hash table H.  */
- 
- #define HASH_HASH(H, IDX)  AREF ((H)->hash, (IDX))
- 
- /* Value is the index of the element in hash table H that is the
-    start of the collision list at index IDX in the index vector of H.  */
- 
- #define HASH_INDEX(H, IDX)  AREF ((H)->index, (IDX))
- 
- /* Value is the size of hash table H.  */
- 
- #define HASH_TABLE_SIZE(H) XVECTOR ((H)->next)->size
- 
  /* The list of all weak hash tables.  Don't staticpro this one.  */
  
  Lisp_Object Vweak_hash_tables;
--- 3896,3901 ----
***************
*** 4929,4936 ****
  
    /* See if there's a `:size SIZE' argument.  */
    i = get_key_arg (QCsize, nargs, args, used);
!   size = i < 0 ? make_number (DEFAULT_HASH_SIZE) : args[i];
!   if (!INTEGERP (size) || XINT (size) < 0)
      Fsignal (Qerror,
             list2 (build_string ("Invalid hash table size"),
                    size));
--- 4903,4912 ----
  
    /* See if there's a `:size SIZE' argument.  */
    i = get_key_arg (QCsize, nargs, args, used);
!   size = i < 0 ? Qnil : args[i];
!   if (NILP (size))
!     size = make_number (DEFAULT_HASH_SIZE);
!   else if (!INTEGERP (size) || XINT (size) < 0)
      Fsignal (Qerror,
             list2 (build_string ("Invalid hash table size"),
                    size));
***************
*** 4988,5009 ****
  }
  
  
- DEFUN ("makehash", Fmakehash, Smakehash, 0, 1, 0,
-        doc: /* Create a new hash table.
-         
- Optional first argument TEST specifies how to compare keys in the
- table.  Predefined tests are `eq', `eql', and `equal'.  Default is
- `eql'.  New tests can be defined with `define-hash-table-test'.  */)
-      (test)
-      Lisp_Object test;
- {
-   Lisp_Object args[2];
-   args[0] = QCtest;
-   args[1] = NILP (test) ? Qeql : test;
-   return Fmake_hash_table (2, args);
- }
- 
- 
  DEFUN ("hash-table-count", Fhash_table_count, Shash_table_count, 1, 1, 0,
         doc: /* Return the number of elements in TABLE.  */)
       (table)
--- 4964,4969 ----
***************
*** 5427,5433 ****
    defsubr (&Ssxhash);
    defsubr (&Smake_hash_table);
    defsubr (&Scopy_hash_table);
-   defsubr (&Smakehash);
    defsubr (&Shash_table_count);
    defsubr (&Shash_table_rehash_size);
    defsubr (&Shash_table_rehash_threshold);
--- 5387,5392 ----