master 23c01a23a3 4/4: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 23c01a23a3a23ad195ebbbaad9a0b6de846b41b0
Merge: 4ac59b3313 e3b8577525
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-28
    
    e3b8577525 ; * etc/DEBUG: Fix wording of "X protocol errors" section.
---
 etc/DEBUG | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/DEBUG b/etc/DEBUG
index df289310f9..f57e6f197b 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -661,10 +661,10 @@ Setting a breakpoint in the function 'x_error_quitter' 
and looking at
 the backtrace when Emacs stops inside that function will show what
 code causes the X protocol errors.
 
-Note that the -xrm option may have no effect when you make an Emacs
-process invoked with the -nw option a server and want to trace X
-protocol errors from subsequent invocations of emacsclient in a GUI
-frame.  In that case calling the initial Emacs via
+Note that the -xrm option may have no effect when you start a server
+in an Emacs session invoked with the -nw command-line option, and want
+to trace X protocol errors from GUI frames created by subsequent
+invocations of emacsclient.  In that case starting Emacs via
 
   emacs -nw --eval '(setq x-command-line-resources "emacs.synchronous: true")'