aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorStefan Kangas2023-10-01 13:21:39 +0200
committerStefan Kangas2023-10-01 13:58:53 +0200
commit6bdc5cfe384a017d775421e03ed4d77feddb76b9 (patch)
tree1ef8ee200e32882aeaac519b6a27ddce502abc39 /doc/misc
parentd210d761b19260c9ee7adf58f01ab1805c9d930a (diff)
downloademacs-6bdc5cfe384a017d775421e03ed4d77feddb76b9.tar.gz
emacs-6bdc5cfe384a017d775421e03ed4d77feddb76b9.zip
Doc fix; more consistently refer to "text terminals"
In the Emacs Lisp manual, we refer to "text terminals" and "graphical terminals" (see Info node `(elisp) Frames'). But in some places, including the user manual, the alternative terminology "non-window terminals" is used instead. In other places, we use the terminology "non-windowing display" instead of the more canonical "non-graphical display". This is less clear than it could be. Let's consolidate our terminology to prefer the wording from the Emacs Lisp manual; in other words, prefer "text" and "non-graphical" to "non-window". * doc/emacs/frames.texi (Non-Window Terminals): Rename node from this... (Text Terminals): ...to this. (Bug#66282) * doc/emacs/display.texi (Standard Faces): * doc/emacs/emacs.texi (Top): * doc/emacs/misc.texi (emacsclient Options): * doc/misc/viper.texi (Rudimentary Changes) (Packages that Change Keymaps): * doc/emacs/frames.texi (Frames, Frame Commands, Mouse Avoidance): Replace instances of "non-window terminals" with "text terminals". * doc/misc/ediff.texi (Quick Help Customization): (Window and Frame Configuration): * lisp/vc/ediff.el (ediff-windows-wordwise) (ediff-windows-linewise): Prefer saying 'non-graphical display' to 'non-windowing display'. * lisp/net/tramp.el (tramp-default-method): * lisp/printing.el (pr-find-command): Capitalize 'Windows' where it clearly refers to the non-free operating system with that name.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ediff.texi6
-rw-r--r--doc/misc/viper.texi7
2 files changed, 6 insertions, 7 deletions
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index ce6cb8c9bd6..f3c671635eb 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -1368,13 +1368,13 @@ the variable @code{ediff-help-message}, which is local to
1368@node Window and Frame Configuration 1368@node Window and Frame Configuration
1369@section Window and Frame Configuration 1369@section Window and Frame Configuration
1370 1370
1371On a non-windowing display, Ediff sets things up in one frame, splitting 1371On a non-graphical display, Ediff sets things up in one frame, splitting
1372it between a small control window and the windows for buffers A, B, and C@. 1372it between a small control window and the windows for buffers A, B, and C@.
1373The split between these windows can be horizontal or 1373The split between these windows can be horizontal or
1374vertical, which can be changed interactively by typing @kbd{|} while the 1374vertical, which can be changed interactively by typing @kbd{|} while the
1375cursor is in the control window. 1375cursor is in the control window.
1376 1376
1377On a window display, Ediff sets up a dedicated frame for Ediff Control 1377On a graphical display, Ediff sets up a dedicated frame for Ediff Control
1378Panel and then it chooses windows as follows: If one of the buffers 1378Panel and then it chooses windows as follows: If one of the buffers
1379is invisible, it is displayed in the currently selected frame. If 1379is invisible, it is displayed in the currently selected frame. If
1380a buffer is visible, it is displayed in the frame where it is visible. 1380a buffer is visible, it is displayed in the frame where it is visible.
@@ -1477,7 +1477,7 @@ The multiframe setup is done by the
1477@code{ediff-setup-windows-multiframe} function, which is the default on 1477@code{ediff-setup-windows-multiframe} function, which is the default on
1478windowing displays. The plain setup, one where all windows are always 1478windowing displays. The plain setup, one where all windows are always
1479in one frame, is done by @code{ediff-setup-windows-plain}, which is the 1479in one frame, is done by @code{ediff-setup-windows-plain}, which is the
1480default on a non-windowing display (or in an xterm window). In fact, 1480default on a non-graphical display (or in an xterm window). In fact,
1481under Emacs, you can switch freely between these two setups by executing 1481under Emacs, you can switch freely between these two setups by executing
1482the command @code{ediff-toggle-multiframe} using the Minibuffer of the 1482the command @code{ediff-toggle-multiframe} using the Minibuffer of the
1483Menubar. 1483Menubar.
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 3e038520287..e0ab563ca33 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -8,8 +8,7 @@
8@include docstyle.texi 8@include docstyle.texi
9 9
10@copying 10@copying
11Copyright @copyright{} 1995--1997, 2001--2023 Free Software Foundation, 11Copyright @copyright{} 1995--2023 Free Software Foundation, Inc.
12Inc.
13 12
14@quotation 13@quotation
15Permission is granted to copy, distribute and/or modify this document 14Permission is granted to copy, distribute and/or modify this document
@@ -1700,7 +1699,7 @@ a text-formatting function, @code{indent-for-tab-command} (which facilitates
1700programming and document writing). Instead, the tab is inserted via the 1699programming and document writing). Instead, the tab is inserted via the
1701command @code{viper-insert-tab}, which is bound to @kbd{S-tab} (shift + tab). 1700command @code{viper-insert-tab}, which is bound to @kbd{S-tab} (shift + tab).
1702 1701
1703On some non-windowing terminals, Shift doesn't modify the @key{TAB} key, so 1702On some text terminals, Shift doesn't modify the @key{TAB} key, so
1704@kbd{S-tab} behaves as if it were @key{TAB}. In such a case, you will have 1703@kbd{S-tab} behaves as if it were @key{TAB}. In such a case, you will have
1705to bind @code{viper-insert-tab} to some other convenient key. 1704to bind @code{viper-insert-tab} to some other convenient key.
1706 1705
@@ -2232,7 +2231,7 @@ For this reason, Viper doesn't change the standard Emacs binding of
2232(except for users at level 1). Instead, in Viper, the key 2231(except for users at level 1). Instead, in Viper, the key
2233@kbd{S-tab} (shift+ tab) is chosen to emulate Vi's @key{TAB}. 2232@kbd{S-tab} (shift+ tab) is chosen to emulate Vi's @key{TAB}.
2234 2233
2235We should note that on some non-windowing terminals, Shift doesn't modify 2234We should note that on some text terminals, Shift doesn't modify
2236the @key{TAB} key, so @kbd{S-tab} behaves as if it were @key{TAB}. In such 2235the @key{TAB} key, so @kbd{S-tab} behaves as if it were @key{TAB}. In such
2237a case, you will have to bind @code{viper-insert-tab} to some other 2236a case, you will have to bind @code{viper-insert-tab} to some other
2238convenient key. 2237convenient key.