Subject: bug#51217: 28.0.60; Use "graphical displays" instead of "X terminals" in docs

From: Stefan Kangas <[email-masked]>
Date: Thu, 14 Oct 2021 16:45:57 -0700

Severity: wishlist

In (info "(elisp) Other Char Bits"), I read:

    Emacs uses the 2**25 bit to indicate that the shift key
    was used in typing a control character.  This distinction is possible
    only when you use X terminals or other special terminals; ordinary text
    terminals do not report the distinction.

Can we change "when you use X terminals or other special terminals" to
"on a graphical display"?

See the attached patch that also fixes some other similar cases.
From f88d6e715948b80952f34de2ec5eafbccca92d70 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <[email-masked]>
Date: Fri, 15 Oct 2021 01:24:36 +0200
Subject: [PATCH] Prefer "graphical displays" to "X terminals"

* doc/lispref/objects.texi (Other Char Bits):
* lisp/bindings.el:
* lisp/gnus/gnus-undo.el (gnus-undo-mode-map): Say "graphical display"
instead of "X terminal"; the latter term is archaic.

* doc/lispref/objects.texi (Ctl-Char Syntax): Say "text terminal"
instead of "ordinary text terminal"; most users use a graphical
display these days.
---
 doc/lispref/objects.texi | 15 +++++++--------
 lisp/bindings.el         |  2 +-
 lisp/gnus/gnus-undo.el   |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 365d5ac8d6..499fa78876 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -516,9 +516,9 @@ Ctl-Char Syntax
 2**26
 @end ifnottex
 bit as well as the code for the corresponding non-control character.
-Ordinary text terminals have no way of generating non-@acronym{ASCII}
-control characters, but you can generate them straightforwardly using
-X and other window systems.
+Text terminals have no way of generating non-@acronym{ASCII} control
+characters, but you can generate them straightforwardly using X and
+other window systems.
 
   For historical reasons, Emacs treats the @key{DEL} character as
 the control equivalent of @kbd{?}:
@@ -588,11 +588,10 @@ Other Char Bits
 2**25
 @end ifnottex
 bit to indicate that the shift key was used in typing a control
-character.  This distinction is possible only when you use X terminals
-or other special terminals; ordinary text terminals do not report the
-distinction.  The Lisp syntax for the shift bit is @samp{\S-}; thus,
-@samp{?\C-\S-o} or @samp{?\C-\S-O} represents the shifted-control-o
-character.
+character.  This distinction is possible only on a graphical display;
+text terminals do not report the distinction.  The Lisp syntax for the
+shift bit is @samp{\S-}; thus, @samp{?\C-\S-o} or @samp{?\C-\S-O}
+represents the shifted-control-o character.
 
 @cindex hyper characters
 @cindex super characters
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 2c45710a58..303a03b0fa 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -981,7 +981,7 @@ ctl-x-map
 (define-key ctl-x-map "\M-:" 'repeat-complex-command)
 (define-key ctl-x-map "u" 'undo)
 (put 'undo :advertised-binding [?\C-x ?u])
-;; Many people are used to typing C-/ on X terminals and getting C-_.
+;; Many people are used to typing C-/ on graphical displays and getting C-_.
 (define-key global-map [?\C-/] 'undo)
 (define-key global-map "\C-_" 'undo)
 ;; Richard said that we should not use C-x <uppercase letter> and I have
diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el
index 182c8743e0..ba01b49faf 100644
--- a/lisp/gnus/gnus-undo.el
+++ b/lisp/gnus/gnus-undo.el
@@ -79,7 +79,7 @@ gnus-undo-mode-map
   "\M-\C-_" #'gnus-undo
   "\C-_" #'gnus-undo
   "\C-xu" #'gnus-undo
-  ;; many people are used to type `C-/' on X terminals and get `C-_'.
+  ;; many people are used to type `C-/' on graphical displays and get `C-_'.
   [(control /)] #'gnus-undo)
 
 (defun gnus-undo-make-menu-bar ()
-- 
2.30.2