diff options
| author | Gerd Möllmann | 2023-12-23 07:06:06 +0100 |
|---|---|---|
| committer | Gerd Möllmann | 2023-12-23 07:06:06 +0100 |
| commit | a63b206fbde2ead91f1053d80a275f8850e5ffce (patch) | |
| tree | d865f135dc104cf7d3569df8d80045e571558d97 | |
| parent | 0fde935b66e43e4d7ec137ba6195de993168587a (diff) | |
| download | emacs-a63b206fbde2ead91f1053d80a275f8850e5ffce.tar.gz emacs-a63b206fbde2ead91f1053d80a275f8850e5ffce.zip | |
Use new safe_calln on NS
* src/nsterm.m (ns_in_echo_area_1): Use safe_calln.
([EmacsView draggingUpdated:]): Use safe_calln.
| -rw-r--r-- | src/nsterm.m | 12 |
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) | |||
| 7058 | static Lisp_Object | 7058 | static Lisp_Object |
| 7059 | ns_in_echo_area_1 (void *ptr) | 7059 | ns_in_echo_area_1 (void *ptr) |
| 7060 | { | 7060 | { |
| 7061 | Lisp_Object in_echo_area; | 7061 | const specpdl_ref count = SPECPDL_INDEX (); |
| 7062 | specpdl_ref count; | ||
| 7063 | |||
| 7064 | count = SPECPDL_INDEX (); | ||
| 7065 | specbind (Qinhibit_quit, Qt); | 7062 | specbind (Qinhibit_quit, Qt); |
| 7066 | in_echo_area = safe_call (1, Qns_in_echo_area); | 7063 | const Lisp_Object in_echo_area = safe_calln (Qns_in_echo_area); |
| 7067 | |||
| 7068 | return unbind_to (count, in_echo_area); | 7064 | return unbind_to (count, in_echo_area); |
| 7069 | } | 7065 | } |
| 7070 | 7066 | ||
| @@ -8829,8 +8825,8 @@ ns_in_echo_area (void) | |||
| 8829 | so call this function instead. */ | 8825 | so call this function instead. */ |
| 8830 | XSETFRAME (frame, emacsframe); | 8826 | XSETFRAME (frame, emacsframe); |
| 8831 | 8827 | ||
| 8832 | safe_call (4, Vns_drag_motion_function, frame, | 8828 | safe_calln (Vns_drag_motion_function, frame, |
| 8833 | make_fixnum (x), make_fixnum (y)); | 8829 | make_fixnum (x), make_fixnum (y)); |
| 8834 | 8830 | ||
| 8835 | redisplay (); | 8831 | redisplay (); |
| 8836 | #endif | 8832 | #endif |