Commit 791355fd authored by Paul Eggert's avatar Paul Eggert

Prefer CALLN in a few more places

* src/macfont.m (macfont_set_family_cache):
* src/nsterm.m (append2):
* src/xterm.c (x_cr_export_frames):
Prefer CALLN to allocating the arg arrays by hand.
parent 20ff1b5c
......@@ -945,13 +945,7 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char,
Lisp_Object value;
if (!HASH_TABLE_P (macfont_family_cache))
{
Lisp_Object args[2];
args[0] = QCtest;
args[1] = Qeq;
macfont_family_cache = Fmake_hash_table (2, args);
}
macfont_family_cache = CALLN (Fmake_hash_table, QCtest, Qeq);
h = XHASH_TABLE (macfont_family_cache);
i = hash_lookup (h, symbol, &hash);
......
......@@ -440,10 +440,7 @@ - (NSColor *)colorUsingDefaultColorSpace
Utility to append to a list
-------------------------------------------------------------------------- */
{
Lisp_Object array[2];
array[0] = list;
array[1] = list1 (item);
return Fnconc (2, &array[0]);
return CALLN (Fnconc, list, list1 (item));
}
......
......@@ -575,7 +575,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
cairo_t *cr;
int width, height;
void (*surface_set_size_func) (cairo_surface_t *, double, double) = NULL;
Lisp_Object acc = Qnil, args[2];
Lisp_Object acc = Qnil;
int count = SPECPDL_INDEX ();
Fredisplay (Qt);
......@@ -659,9 +659,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
#endif
unbind_to (count, Qnil);
args[0] = intern ("concat");
args[1] = Fnreverse (acc);
return Fapply (2, args);
return CALLN (Fapply, intern ("concat"), Fnreverse (acc));
}
#endif /* USE_CAIRO */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment