Count MANY function args more reliably

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index b257da117b6ed9a7beb4358f5bea632a0f952fc4..357526bacfee92bb2d5a65726b86eb56db74b37d 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -349,16 +349,17 @@ fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Objec
        from1 = from, to1 = to;
        args[idx] = char_table_ref_and_range (fontset, from, &from1, &to1);
        char_table_set_range (fontset, from, to1,
-                             NILP (args[idx]) ? args[1 - idx]
-                             : Fvconcat (2, args));
+                             (NILP (args[idx]) ? args[1 - idx]
+                              : CALLMANY (Fvconcat, args)));
        from = to1 + 1;
       } while (from < to);
     }
   else
     {
       args[idx] = FONTSET_FALLBACK (fontset);
-      set_fontset_fallback
-       (fontset, NILP (args[idx]) ? args[1 - idx] : Fvconcat (2, args));
+      set_fontset_fallback (fontset,
+                           (NILP (args[idx]) ? args[1 - idx]
+                            : CALLMANY (Fvconcat, args)));
     }
 }
 
@@ -1432,12 +1433,8 @@ appended.  By default, FONT-SPEC overrides the previous settings.  */)
     }
   else if (STRINGP (font_spec))
     {
-      Lisp_Object args[2];
-
       fontname = font_spec;
-      args[0] = QCname;
-      args[1] = font_spec;
-      font_spec = Ffont_spec (2, args);
+      font_spec = CALLN (Ffont_spec, QCname, fontname);
     }
   else if (FONT_SPEC_P (font_spec))
     fontname = Ffont_xlfd_name (font_spec, Qnil);