diff options
author | Stefan Kangas <stefankangas@gmail.com> | 2023-10-01 13:21:39 +0200 |
---|---|---|
committer | Stefan Kangas <stefankangas@gmail.com> | 2023-10-01 13:58:53 +0200 |
commit | 6bdc5cfe384a017d775421e03ed4d77feddb76b9 (patch) | |
tree | 1ef8ee200e32882aeaac519b6a27ddce502abc39 /lisp | |
parent | d210d761b19260c9ee7adf58f01ab1805c9d930a (diff) | |
download | emacs-6bdc5cfe384a017d775421e03ed4d77feddb76b9.tar.gz |
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 'lisp')
-rw-r--r-- | lisp/net/tramp.el | 2 | ||||
-rw-r--r-- | lisp/printing.el | 4 | ||||
-rw-r--r-- | lisp/vc/ediff.el | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 6b64e26b107..02051736cc5 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -426,7 +426,7 @@ Another host name is useful only in combination with ;; an external method. (cond ;; PuTTY is installed. We don't take it, if it is installed on a - ;; non-windows system, or pscp from the pssh (parallel ssh) package + ;; non-Windows system, or pscp from the pssh (parallel ssh) package ;; is found. ((and (eq system-type 'windows-nt) (executable-find "pscp")) "pscp") ;; There is an ssh installation. diff --git a/lisp/printing.el b/lisp/printing.el index 4a6d14260a0..82419e64201 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -1,6 +1,6 @@ ;;; printing.el --- printing utilities -*- lexical-binding:t -*- -;; Copyright (C) 2000-2001, 2003-2023 Free Software Foundation, Inc. +;; Copyright (C) 2000-2023 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, print, PostScript @@ -5519,7 +5519,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." (setq ext (cdr ext) found nil)) found) - ;; non-windows systems + ;; non-Windows systems (and (file-regular-p cmd) (file-executable-p cmd) cmd))) diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 24836e1b1c1..7e3b20d8939 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -909,7 +909,7 @@ MERGE-AUTOSTORE-DIR is the directory in which to store merged files." (defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks) "Compare WIND-A and WIND-B, which are selected by clicking, wordwise. This compares the portions of text visible in each of the two windows. -With prefix argument, DUMB-MODE, or on a non-windowing display, works as +With prefix argument, DUMB-MODE, or on a non-graphical display, works as follows: If WIND-A is nil, use selected window. If WIND-B is nil, use window next to WIND-A. @@ -923,7 +923,7 @@ arguments after setting up the Ediff buffers." (defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks) "Compare WIND-A and WIND-B, which are selected by clicking, linewise. This compares the portions of text visible in each of the two windows. -With prefix argument, DUMB-MODE, or on a non-windowing display, works as +With prefix argument, DUMB-MODE, or on a non-graphical display, works as follows: If WIND-A is nil, use selected window. If WIND-B is nil, use window next to WIND-A. @@ -935,7 +935,7 @@ arguments after setting up the Ediff buffers." ;; Compare visible portions of text in WIND-A and WIND-B, which are ;; selected by clicking. -;; With prefix argument, DUMB-MODE, or on a non-windowing display, +;; With prefix argument, DUMB-MODE, or on a non-graphical display, ;; works as follows: ;; If WIND-A is nil, use selected window. ;; If WIND-B is nil, use window next to WIND-A. |