[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/gnus-select 57200d8 084/218: Replace "carriage-ret
From: |
Andrew G Cohen |
Subject: |
[Emacs-diffs] feature/gnus-select 57200d8 084/218: Replace "carriage-return" by "carriage return" in manuals |
Date: |
Fri, 14 Dec 2018 03:35:05 -0500 (EST) |
branch: feature/gnus-select
commit 57200d8619ad826598c8f1b0f0178016a108061d
Author: Michael Albinus <address@hidden>
Commit: Andrew G Cohen <address@hidden>
Replace "carriage-return" by "carriage return" in manuals
* doc/emacs/msdos.texi:
* doc/emacs/mule.texi:
* doc/emacs/screen.texi:
* doc/lispref/nonascii.texi:
* doc/misc/calc.texi: Replace "carriage-return" by "carriage
return". Suggested by Richard Stallman <address@hidden> in
address@hidden
---
doc/emacs/msdos.texi | 45 +++++++++++++++++++++++----------------------
doc/emacs/mule.texi | 42 +++++++++++++++++++++---------------------
doc/emacs/screen.texi | 4 ++--
doc/lispref/nonascii.texi | 4 ++--
doc/misc/calc.texi | 2 +-
5 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index 9596954..90f0389 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -152,15 +152,16 @@ window. @xref{emacsclient Options}.
convention used on GNU, Unix, and other POSIX-compliant systems.
@cindex end-of-line conversion on MS-DOS/MS-Windows
- By contrast, MS-DOS and MS-Windows normally use carriage-return linefeed,
-a two-character sequence, to separate text lines. (Linefeed is the same
-character as newline.) Therefore, convenient editing of typical files
-with Emacs requires conversion of these end-of-line (EOL) sequences.
-And that is what Emacs normally does: it converts carriage-return
-linefeed into newline when reading files, and converts newline into
-carriage-return linefeed when writing files. The same mechanism that
-handles conversion of international character codes does this conversion
-also (@pxref{Coding Systems}).
+ By contrast, MS-DOS and MS-Windows normally use carriage return
+followed by linefeed, a two-character sequence, to separate text
+lines. (Linefeed is the same character as newline.) Therefore,
+convenient editing of typical files with Emacs requires conversion of
+these end-of-line (EOL) sequences. And that is what Emacs normally
+does: it converts carriage return followed by linefeed into newline
+when reading files, and converts newline into carriage return followed
+by linefeed when writing files. The same mechanism that handles
+conversion of international character codes does this conversion also
+(@pxref{Coding Systems}).
@cindex cursor location, on MS-DOS
@cindex point location, on MS-DOS
@@ -169,11 +170,11 @@ that character positions as reported by Emacs
(@pxref{Position Info}) do
not agree with the file size information known to the operating system.
In addition, if Emacs recognizes from a file's contents that it uses
-newline rather than carriage-return linefeed as its line separator, it
-does not perform EOL conversion when reading or writing that file.
-Thus, you can read and edit files from GNU and Unix systems on MS-DOS
-with no special effort, and they will retain their Unix-style
-end-of-line convention after you edit them.
+newline rather than carriage return followed by linefeed as its line
+separator, it does not perform EOL conversion when reading or writing
+that file. Thus, you can read and edit files from GNU and Unix
+systems on MS-DOS with no special effort, and they will retain their
+Unix-style end-of-line convention after you edit them.
The mode line indicates whether end-of-line translation was used for
the current buffer. If MS-DOS end-of-line translation is in use for the
@@ -181,20 +182,20 @@ buffer, the MS-Windows build of Emacs displays a
backslash @samp{\} after
the coding system mnemonic near the beginning of the mode line
(@pxref{Mode Line}). If no EOL translation was performed, the string
@samp{(Unix)} is displayed instead of the backslash, to alert you that the
-file's EOL format is not the usual carriage-return linefeed.
+file's EOL format is not the usual carriage return followed by linefeed.
@cindex DOS-to-Unix conversion of files
To visit a file and specify whether it uses DOS-style or Unix-style
end-of-line, specify a coding system (@pxref{Text Coding}). For
example, @kbd{C-x @key{RET} c unix @key{RET} C-x C-f foobar.txt}
visits the file @file{foobar.txt} without converting the EOLs; if some
-line ends with a carriage-return linefeed pair, Emacs will display
address@hidden at the end of that line. Similarly, you can direct Emacs to
-save a buffer in a specified EOL format with the @kbd{C-x @key{RET} f}
-command. For example, to save a buffer with Unix EOL format, type
address@hidden @key{RET} f unix @key{RET} C-x C-s}. If you visit a file
-with DOS EOL conversion, then save it with Unix EOL format, that
-effectively converts the file to Unix EOL style, like the
+line ends with a carriage return followed by linefeed pair, Emacs will
+display @samp{^M} at the end of that line. Similarly, you can direct
+Emacs to save a buffer in a specified EOL format with the @kbd{C-x
address@hidden f} command. For example, to save a buffer with Unix EOL
+format, type @kbd{C-x @key{RET} f unix @key{RET} C-x C-s}. If you
+visit a file with DOS EOL conversion, then save it with Unix EOL
+format, that effectively converts the file to Unix EOL style, like the
@code{dos2unix} program.
@cindex untranslated file system
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index f9dbeff..401c83d 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -690,8 +690,8 @@ system; for example, to visit a file encoded in codepage
850, type
In addition to converting various representations of address@hidden
characters, a coding system can perform end-of-line conversion. Emacs
handles three different conventions for how to separate lines in a file:
-newline (Unix), carriage-return linefeed (DOS), and just
-carriage-return (Mac).
+newline (Unix), carriage return followed by linefeed (DOS), and just
+carriage return (Mac).
@table @kbd
@item C-h C @var{coding} @key{RET}
@@ -728,8 +728,8 @@ system, including the letter that stands for it in the mode
line
@code{no-conversion}, which means no conversion of any kind---specifies
how and whether to convert printing characters, but leaves the choice of
end-of-line conversion to be decided based on the contents of each file.
-For example, if the file appears to use the sequence carriage-return
-linefeed to separate lines, DOS end-of-line conversion will be used.
+For example, if the file appears to use the sequence carriage return
+and linefeed to separate lines, DOS end-of-line conversion will be used.
Each of the listed coding systems has three variants, which specify
exactly what to do for end-of-line conversion:
@@ -741,15 +741,15 @@ newline to separate lines. (This is the convention
normally used
on Unix and GNU systems, and macOS.)
@item @dots{}-dos
-Assume the file uses carriage-return linefeed to separate lines, and do
-the appropriate conversion. (This is the convention normally used on
-Microsoft address@hidden is also specified for MIME @samp{text/*}
-bodies and in other network transport contexts. It is different
-from the SGML reference syntax record-start/record-end format, which
-Emacs doesn't support directly.})
+Assume the file uses carriage return followed by linefeed to separate
+lines, and do the appropriate conversion. (This is the convention
+normally used on Microsoft address@hidden is also specified for
+MIME @samp{text/*} bodies and in other network transport contexts. It
+is different from the SGML reference syntax record-start/record-end
+format, which Emacs doesn't support directly.})
@item @dots{}-mac
-Assume the file uses carriage-return to separate lines, and do the
+Assume the file uses carriage return to separate lines, and do the
appropriate conversion. (This was the convention used in Classic Mac
OS.)
@end table
@@ -859,15 +859,15 @@ the third argument says which coding system to use for
these files.
@vindex inhibit-eol-conversion
@cindex DOS-style end-of-line display
Emacs recognizes which kind of end-of-line conversion to use based on
-the contents of the file: if it sees only carriage-returns, or only
-carriage-return linefeed sequences, then it chooses the end-of-line
-conversion accordingly. You can inhibit the automatic use of
-end-of-line conversion by setting the variable @code{inhibit-eol-conversion}
-to address@hidden If you do that, DOS-style files will be displayed
-with the @samp{^M} characters visible in the buffer; some people
-prefer this to the more subtle @samp{(DOS)} end-of-line type
-indication near the left edge of the mode line (@pxref{Mode Line,
-eol-mnemonic}).
+the contents of the file: if it sees only carriage returns, or only
+carriage return followed by linefeed sequences, then it chooses the
+end-of-line conversion accordingly. You can inhibit the automatic use
+of end-of-line conversion by setting the variable
address@hidden to address@hidden If you do that,
+DOS-style files will be displayed with the @samp{^M} characters
+visible in the buffer; some people prefer this to the more subtle
address@hidden(DOS)} end-of-line type indication near the left edge of the
+mode line (@pxref{Mode Line, eol-mnemonic}).
@vindex inhibit-iso-escape-detection
@cindex escape sequences in files
@@ -1041,7 +1041,7 @@ buffer (@pxref{Output Coding}).
(@pxref{Coding Systems, end-of-line conversion}) for encoding the
current buffer. For example, @kbd{C-x @key{RET} f dos @key{RET}} will
cause Emacs to save the current buffer's text with DOS-style
-carriage-return linefeed line endings.
+carriage return followed by linefeed line endings.
@kindex C-x RET c
@findex universal-coding-system-argument
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 19a4a9e..8f2be4b 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -205,11 +205,11 @@ terminal output. Furthermore, if you are using an input
method,
string is displayed, that indicates a nontrivial end-of-line
convention for encoding a file. Usually, lines of text are separated
by @dfn{newline characters} in a file, but two other conventions are
-sometimes used. The MS-DOS convention uses a carriage-return
+sometimes used. The MS-DOS convention uses a carriage return
character followed by a linefeed character; when editing such
files, the colon changes to either a backslash (@samp{\}) or
@samp{(DOS)}, depending on the operating system. Another convention,
-employed by older Macintosh systems, uses a carriage-return
+employed by older Macintosh systems, uses a carriage return
character instead of a newline; when editing such files, the colon
changes to either a forward slash (@samp{/}) or @samp{(Mac)}. On some
systems, Emacs displays @samp{(Unix)} instead of the colon for files
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 8bc7e20..70df555 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1074,9 +1074,9 @@ that result from encoding unsupported characters.
used on various systems for representing end of line in files. The
Unix convention, used on GNU and Unix systems, is to use the linefeed
character (also called newline). The DOS convention, used on
-MS-Windows and MS-DOS systems, is to use a carriage-return and a
+MS-Windows and MS-DOS systems, is to use a carriage return and a
linefeed at the end of a line. The Mac convention is to use just
-carriage-return. (This was the convention used in Classic Mac OS.)
+carriage return. (This was the convention used in Classic Mac OS.)
@cindex base coding system
@cindex variant coding system
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index be78a53..0c8c2db 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -33164,7 +33164,7 @@ This switches into the Calc buffer for the duration of
the macro.
For example, @samp{(calc-eval "vx5\rVR+" 'macro)} pushes the
vector @samp{[1,2,3,4,5]} on the stack and then replaces it
with the sum of those numbers. Note that @samp{\r} is the Lisp
-notation for the carriage-return, @key{RET}, character.
+notation for the carriage return, @key{RET}, character.
If your keyboard macro wishes to pop the stack, @samp{\C-d} is
safer than @samp{\177} (the @key{DEL} character) because some
- [Emacs-diffs] feature/gnus-select 29b7170 073/218: Doc fixes re obsolete items, (continued)
- [Emacs-diffs] feature/gnus-select 29b7170 073/218: Doc fixes re obsolete items, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 77bf8e0 077/218: Fix line-wrapping for term.el (Bug#30775), Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select e274f0b 075/218: Fix some allout.el aliases, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select c6e52fa 088/218: Improve robustness in tramp-sh.el, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select c4bd17e 079/218: ; * test/README: Fix typo, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 4a6cf41 156/218: * doc/lispref/internals.texi (Writing Emacs Primitives): Fix grammar., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select b4377a3 164/218: Handle possible classtype values in eieio-persistent-read, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select ff16207 153/218: ; * autogen.sh: Comment., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 590166c 151/218: Firm up documentation of generalized variables, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select a3e7de9 086/218: Fix mouse-set-point when line numbers are displayed, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 57200d8 084/218: Replace "carriage-return" by "carriage return" in manuals,
Andrew G Cohen <=
- [Emacs-diffs] feature/gnus-select 620b63a 092/218: * lisp/progmodes/verilog-mode.el (verilog-mode): Quieten compilation., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 3ef9943 067/218: * lisp/obsolete/options.el: Remove file., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 2544299 076/218: Try to stop tramp test hangs on hydra, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 520498d 091/218: Improve port to NetBSD tzalloc, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 02b297b 044/218: ; Revert "; Tracing for eieio-test random failure (Bug#24503)", Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select a381e7e 002/218: Define if-let* and derivatives as aliases for if-let etc, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select a8e5163 070/218: Minor changes in mule.texi, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 03e7331 089/218: * lisp/pcomplete.el (pcomplete-here): Move before first reference., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 040f725 093/218: * lisp/emulation/cua-base.el (cua-paste): Quieten compilation., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select f5219ae 094/218: Replace some obsolete uses of filter-buffer-substring-functions, Andrew G Cohen, 2018/12/14