From: Po Lu <luangruo@yahoo.com>
Date: Sun, 12 Feb 2023 12:32:31 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master' into feature/android
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=19eb27d47787bd8a519a37a8e6080ed5b56435dc;p=emacs.git

Merge remote-tracking branch 'origin/master' into feature/android
---

19eb27d47787bd8a519a37a8e6080ed5b56435dc
diff --cc etc/NEWS
index a266ffe75e6,d3eafaadf19..840705d8613
--- a/etc/NEWS
+++ b/etc/NEWS
@@@ -65,12 -59,13 +65,19 @@@ This allows the user to customize the p
  
  * Editing Changes in Emacs 30.1
  
 ++++
 +** Emacs now has better support for touchscreen events.
 +Many touch screen gestures are now implemented, as is support for
 +tapping buttons and opening menus.
 +
 +
+ ---
+ ** On X, Emacs now supports input methods which perform "string conversion".
+ This means an input method can now ask Emacs to delete text
+ surrounding point and replace it with something else, as well as query
+ Emacs for surrounding text.  If your input method allows you to "undo"
+ mistaken compositions, this will now work as well.
+ 
  ---
  ** New command 'kill-matching-buffers-no-ask'.
  This works like 'kill-matching-buffers', but without asking for