upstream

1 files changed, 2 insertions, 10 deletions

diff --git a/src/composite.c b/src/composite.c
index bfc8093a87f..62ab3d04948 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -947,20 +947,12 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t
                                        string);
   if (NILP (LGSTRING_ID (lgstring)))
     {
-      Lisp_Object args[6];
-
       /* Save point as marker before calling out to lisp.  */
       if (NILP (string))
         record_unwind_protect (restore_point_unwind,
                                build_marker (current_buffer, pt, pt_byte));
-
-      args[0] = Vauto_composition_function;
-      args[1] = AREF (rule, 2);
-      args[2] = pos;
-      args[3] = make_number (to);
-      args[4] = font_object;
-      args[5] = string;
-      lgstring = safe_call (6, args);
+      lgstring = safe_call (6, Vauto_composition_function, AREF (rule, 2),
+                            pos, make_number (to), font_object, string);
     }
   return unbind_to (count, lgstring);
 }