X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Frangetab.c;h=c580a4719b5475d6f061b18540656bc86ba56874;hb=b750fd14c6dce66e91fa62db0deda838f037d6d6;hp=ee35b601bb0efea89cc8cf654fb564761afd68f3;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git diff --git a/src/rangetab.c b/src/rangetab.c index ee35b60..c580a47 100644 --- a/src/rangetab.c +++ b/src/rangetab.c @@ -47,7 +47,7 @@ mark_range_table (Lisp_Object obj, void (*markobj) (Lisp_Object)) int i; for (i = 0; i < Dynarr_length (rt->entries); i++) - (markobj) (Dynarr_at (rt->entries, i).val); + markobj (Dynarr_at (rt->entries, i).val); return Qnil; } @@ -208,7 +208,7 @@ You can manipulate it using `put-range-table', `get-range-table', { Lisp_Object obj; struct Lisp_Range_Table *rt = alloc_lcrecord_type (struct Lisp_Range_Table, - lrecord_range_table); + &lrecord_range_table); rt->entries = Dynarr_new (range_table_entry); XSETRANGE_TABLE (obj, rt); return obj; @@ -226,7 +226,7 @@ ranges as the given table. The values will not themselves be copied. CHECK_RANGE_TABLE (old_table); rt = XRANGE_TABLE (old_table); - rtnew = alloc_lcrecord_type (struct Lisp_Range_Table, lrecord_range_table); + rtnew = alloc_lcrecord_type (struct Lisp_Range_Table, &lrecord_range_table); rtnew->entries = Dynarr_new (range_table_entry); Dynarr_add_many (rtnew->entries, Dynarr_atp (rt->entries, 0), @@ -242,15 +242,13 @@ If there is no corresponding value, return DEFAULT (defaults to nil). (pos, table, default_)) { struct Lisp_Range_Table *rt; - EMACS_INT po; CHECK_RANGE_TABLE (table); rt = XRANGE_TABLE (table); CHECK_INT_COERCE_CHAR (pos); - po = XINT (pos); - return get_range_table (po, Dynarr_length (rt->entries), + return get_range_table (XINT (pos), Dynarr_length (rt->entries), Dynarr_atp (rt->entries, 0), default_); }