Merge from savannah/emacs-30

e539a5c7d7 NS: Fix placement of candidate window (bug#72422)
94fe5894d9 ; * lisp/touch-screen.el: Correct commentary.

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.

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 */