Merge remote-tracking branch 'refs/remotes/origin/master'

2026-02-26 21:43:12 +01:00
parent c8d7d11136 220e90144f
commit f6c4328cf6
1 changed files with 2 additions and 4 deletions
--- a/patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch
+++ b/patches/0001-ns-implement-AXBoundsForRange-for-macOS-Zoom-cursor-.patch
@@ -585,8 +585,6 @@ index 932d209..da40369 100644
 }
 
 -- (void) noteUserCancelledSelection
-+extern Lisp_Object last_command_event;
-+
 +static bool
 +ns_ax_event_is_ctrl_n_or_p (int *which)
 {
@@ -603,13 +601,13 @@ index 932d209..da40369 100644
 
 -  [NSApp stop: self];
 +  EMACS_INT c = XFIXNUM (ev);
-+  if (c == '\C-n')
+  if (c == ('n' & 0x1f))
 +    {
 +      if (which)
 +	*which = 1;
 +      return true;
 +    }
-+  if (c == '\C-p')
+  if (c == ('p' & 0x1f))
 +    {
 +      if (which)
 +	*which = -1;