From 94fe5894d99f8bb5cb175d7646f07e68360f2089 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 3 Aug 2024 08:14:52 +0800 Subject: [PATCH 1/2] ; * lisp/touch-screen.el: Correct commentary. --- lisp/touch-screen.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el index e7d33845f09..a52d0367258 100644 --- a/lisp/touch-screen.el +++ b/lisp/touch-screen.el @@ -23,8 +23,8 @@ ;;; Commentary: ;; This file provides code to recognize simple touch screen gestures. -;; It is used on X, PGTK, and Android, currently the only systems where -;; Emacs supports touch input. +;; It is used on X, PGTK, Android, and MS-Windows, currently the only +;; systems where Emacs supports touch input. ;; ;; See (elisp)Touchscreen Events for a description of the details of ;; touch events. From e539a5c7d79b76eb16eed4cb5da4c3a531a640b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerd=20M=C3=B6llmann?= Date: Sat, 3 Aug 2024 10:29:24 +0200 Subject: [PATCH 2/2] NS: Fix placement of candidate window (bug#72422) * src/nsterm.m ([EmacsView firstRectForCharacterRange:actualRange:]): Call method of NSTextInput. --- src/nsterm.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nsterm.m b/src/nsterm.m index b56c587bc69..b883e605a5b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -7064,7 +7064,7 @@ - (void) setMarkedText: (id) string - (NSRect) firstRectForCharacterRange: (NSRange) range actualRange: (nullable NSRangePointer) actualRange { - return NSZeroRect; + return [self firstRectForCharacterRange: range]; } #endif /* NS_IMPL_COCOA */