Hmm... this still looks like an ugly hack, and still without any
comments explaining why we're doing it.
E.g. why do we need `safe_call` in addition to `internal_catch_all`?
If we're using `safe_call`, why not use that code's handling of
`inhibit_quit` and write our own around it instead?
AFAICT we don't *really* know why we need `internal_catch_all` or
`inhibit-quit` and even less if/why we need both. And we don't know
what we *should* do if this code signals a weird error or
`throw`s, really (currently, we just silently drop the error/throw, but
maybe we should arrange for it to be "recreated" elsewhere).
I'm not in a position to dig any further, and it looks like noone here
is either, but *please* add a comment explaining as much as you can
about what we know now, so as to help the future guy who wants to try
and figure it out (or so as to avoid re-introducing the problem when
someone stumbles upon this weird code full of redundant protections and
figures it can be simplified).
Stefan
Po Lu via Mailing list for Emacs changes [2022-11-12 20:04:39] wrote:
> branch: master
> commit 47b377f64bef8c3da519b3aa9c5c90b7199ba524
> Author: Po Lu <luangruo@yahoo.com>
> Commit: Po Lu <luangruo@yahoo.com>
>
> Prevent non-local exits from ns-in-echo-area
>
> * src/nsterm.m (ns_in_echo_area_1):
> (ns_in_echo_area_2):
> (ns_in_echo_area): New functions.
> ([EmacsView firstRectForCharacterRange:]): Call them instead.
> (syms_of_nsterm): New defsym.
> ---
> src/nsterm.m | 33 ++++++++++++++++++++++++++++++++-
> 1 file changed, 32 insertions(+), 1 deletion(-)
>
> diff --git a/src/nsterm.m b/src/nsterm.m
> index 17f40dc7e3..507f2a9e7d 100644
> --- a/src/nsterm.m
> +++ b/src/nsterm.m
> @@ -7056,6 +7056,36 @@ ns_create_font_panel_buttons (id target, SEL select,
> SEL cancel_action)
> processingCompose = NO;
> }
>
> +static Lisp_Object
> +ns_in_echo_area_1 (void *ptr)
> +{
> + Lisp_Object in_echo_area;
> + specpdl_ref count;
> +
> + count = SPECPDL_INDEX ();
> + specbind (Qinhibit_quit, Qt);
> + in_echo_area = safe_call (1, Qns_in_echo_area);
> +
> + return unbind_to (count, in_echo_area);
> +}
> +
> +static Lisp_Object
> +ns_in_echo_area_2 (enum nonlocal_exit exit, Lisp_Object error)
> +{
> + return Qnil;
> +}
> +
> +static bool
> +ns_in_echo_area (void)
> +{
> + Lisp_Object in_echo_area;
> +
> + in_echo_area
> + = internal_catch_all (ns_in_echo_area_1, NULL,
> + ns_in_echo_area_2);
> +
> + return !NILP (in_echo_area);
> +}
>
> /* Used to position char selection windows, etc. */
> - (NSRect)firstRectForCharacterRange: (NSRange)theRange
> @@ -7069,7 +7099,7 @@ ns_create_font_panel_buttons (id target, SEL select,
> SEL cancel_action)
> if (NS_KEYLOG)
> NSLog (@"firstRectForCharRange request");
>
> - if (WINDOWP (echo_area_window) && ! NILP (call0 (intern
> ("ns-in-echo-area"))))
> + if (WINDOWP (echo_area_window) && ns_in_echo_area ())
> win = XWINDOW (echo_area_window);
> else
> win = XWINDOW (FRAME_SELECTED_WINDOW (emacsframe));
> @@ -11012,6 +11042,7 @@ respectively. */);
> DEFSYM (Qcondensed, "condensed");
> DEFSYM (Qreverse_italic, "reverse-italic");
> DEFSYM (Qexpanded, "expanded");
> + DEFSYM (Qns_in_echo_area, "ns-in-echo-area");
>
> #ifdef NS_IMPL_COCOA
> Fprovide (Qcocoa, Qnil);
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4