1 files changed, 4 insertions, 8 deletions

diff --git a/src/nsterm.m b/src/nsterm.m
index 46a5e8870e8..2f736980ea6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7058,13 +7058,9 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action)
 static Lisp_Object
 ns_in_echo_area_1 (void *ptr)
 {
-  Lisp_Object in_echo_area;
-  specpdl_ref count;
-
-  count = SPECPDL_INDEX ();
+  const specpdl_ref count = SPECPDL_INDEX ();
   specbind (Qinhibit_quit, Qt);
-  in_echo_area = safe_call (1, Qns_in_echo_area);
-
+  const Lisp_Object in_echo_area = safe_calln (Qns_in_echo_area);
   return unbind_to (count, in_echo_area);
 }
 
@@ -8829,8 +8825,8 @@ ns_in_echo_area (void)
      so call this function instead.  */
   XSETFRAME (frame, emacsframe);
 
-  safe_call (4, Vns_drag_motion_function, frame,
-             make_fixnum (x), make_fixnum (y));
+  safe_calln (Vns_drag_motion_function, frame,
+              make_fixnum (x), make_fixnum (y));
 
   redisplay ();
 #endif