summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2022-08-26 06:30:30 +0200
committerStefan Kangas <stefankangas@gmail.com>2022-08-26 06:30:30 +0200
commit23c01a23a3a23ad195ebbbaad9a0b6de846b41b0 (patch)
tree9cd5327dde0f7987eb11500a7ed01f558359079a
parent4ac59b331372fb3cf894e1bbf9083a34c27bff33 (diff)
parente3b85775252adbe3135580df321cbd69eb2f2bf1 (diff)
downloademacs-23c01a23a3a23ad195ebbbaad9a0b6de846b41b0.tar.gz
Merge from origin/emacs-28
e3b8577525 ; * etc/DEBUG: Fix wording of "X protocol errors" section.
-rw-r--r--etc/DEBUG8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/DEBUG b/etc/DEBUG
index df289310f9f..f57e6f197bf 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")'