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

This commit is contained in:
Martin Sukany
2026-02-26 21:38:10 +01:00

View File

@@ -0,0 +1,45 @@
From ea8100f3110bf937aa69b098d2227352524f34e8 Mon Sep 17 00:00:00 2001
From: Daneel <daneel@sukany.cz>
Date: Thu, 26 Feb 2026 21:37:16 +0100
Subject: [PATCH] ns: fix build errors in C-n/C-p key detection
Remove redundant extern declaration of last_command_event which
is already a macro in globals.h (globals.f_last_command_event).
Replace invalid C escape sequences '\C-n'/'\C-p' with their ASCII
integer values 14 (Ctrl+N) and 16 (Ctrl+P).
---
nsterm.m | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/nsterm.m b/nsterm.m
index da40369..5ca0deb 100644
--- a/nsterm.m
+++ b/nsterm.m
@@ -7250,8 +7250,6 @@ ns_ax_find_completion_overlay_range (struct buffer *b, ptrdiff_t point,
return YES;
}
-extern Lisp_Object last_command_event;
-
static bool
ns_ax_event_is_ctrl_n_or_p (int *which)
{
@@ -7263,13 +7261,13 @@ ns_ax_event_is_ctrl_n_or_p (int *which)
return false;
EMACS_INT c = XFIXNUM (ev);
- if (c == '\C-n')
+ if (c == 14) /* C-n */
{
if (which)
*which = 1;
return true;
}
- if (c == '\C-p')
+ if (c == 16) /* C-p */
{
if (which)
*which = -1;
--
2.43.0