mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-08 21:29:37 +00:00
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 <rms@gnu.org> in emacs-manual-bugs@gnu.org.
This commit is contained in:
parent
2616cd94f1
commit
2b8507fbdc
5 changed files with 49 additions and 48 deletions
|
@ -152,15 +152,16 @@ window. @xref{emacsclient Options}.
|
||||||
convention used on GNU, Unix, and other POSIX-compliant systems.
|
convention used on GNU, Unix, and other POSIX-compliant systems.
|
||||||
|
|
||||||
@cindex end-of-line conversion on MS-DOS/MS-Windows
|
@cindex end-of-line conversion on MS-DOS/MS-Windows
|
||||||
By contrast, MS-DOS and MS-Windows normally use carriage-return linefeed,
|
By contrast, MS-DOS and MS-Windows normally use carriage return
|
||||||
a two-character sequence, to separate text lines. (Linefeed is the same
|
followed by linefeed, a two-character sequence, to separate text
|
||||||
character as newline.) Therefore, convenient editing of typical files
|
lines. (Linefeed is the same character as newline.) Therefore,
|
||||||
with Emacs requires conversion of these end-of-line (EOL) sequences.
|
convenient editing of typical files with Emacs requires conversion of
|
||||||
And that is what Emacs normally does: it converts carriage-return
|
these end-of-line (EOL) sequences. And that is what Emacs normally
|
||||||
linefeed into newline when reading files, and converts newline into
|
does: it converts carriage return followed by linefeed into newline
|
||||||
carriage-return linefeed when writing files. The same mechanism that
|
when reading files, and converts newline into carriage return followed
|
||||||
handles conversion of international character codes does this conversion
|
by linefeed when writing files. The same mechanism that handles
|
||||||
also (@pxref{Coding Systems}).
|
conversion of international character codes does this conversion also
|
||||||
|
(@pxref{Coding Systems}).
|
||||||
|
|
||||||
@cindex cursor location, on MS-DOS
|
@cindex cursor location, on MS-DOS
|
||||||
@cindex point 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.
|
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
|
In addition, if Emacs recognizes from a file's contents that it uses
|
||||||
newline rather than carriage-return linefeed as its line separator, it
|
newline rather than carriage return followed by linefeed as its line
|
||||||
does not perform EOL conversion when reading or writing that file.
|
separator, it does not perform EOL conversion when reading or writing
|
||||||
Thus, you can read and edit files from GNU and Unix systems on MS-DOS
|
that file. Thus, you can read and edit files from GNU and Unix
|
||||||
with no special effort, and they will retain their Unix-style
|
systems on MS-DOS with no special effort, and they will retain their
|
||||||
end-of-line convention after you edit them.
|
Unix-style end-of-line convention after you edit them.
|
||||||
|
|
||||||
The mode line indicates whether end-of-line translation was used for
|
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
|
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
|
the coding system mnemonic near the beginning of the mode line
|
||||||
(@pxref{Mode Line}). If no EOL translation was performed, the string
|
(@pxref{Mode Line}). If no EOL translation was performed, the string
|
||||||
@samp{(Unix)} is displayed instead of the backslash, to alert you that the
|
@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
|
@cindex DOS-to-Unix conversion of files
|
||||||
To visit a file and specify whether it uses DOS-style or Unix-style
|
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
|
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}
|
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
|
visits the file @file{foobar.txt} without converting the EOLs; if some
|
||||||
line ends with a carriage-return linefeed pair, Emacs will display
|
line ends with a carriage return followed by linefeed pair, Emacs will
|
||||||
@samp{^M} at the end of that line. Similarly, you can direct Emacs to
|
display @samp{^M} at the end of that line. Similarly, you can direct
|
||||||
save a buffer in a specified EOL format with the @kbd{C-x @key{RET} f}
|
Emacs to save a buffer in a specified EOL format with the @kbd{C-x
|
||||||
command. For example, to save a buffer with Unix EOL format, type
|
@key{RET} f} command. For example, to save a buffer with Unix EOL
|
||||||
@kbd{C-x @key{RET} f unix @key{RET} C-x C-s}. If you visit a file
|
format, type @kbd{C-x @key{RET} f unix @key{RET} C-x C-s}. If you
|
||||||
with DOS EOL conversion, then save it with Unix EOL format, that
|
visit a file with DOS EOL conversion, then save it with Unix EOL
|
||||||
effectively converts the file to Unix EOL style, like the
|
format, that effectively converts the file to Unix EOL style, like the
|
||||||
@code{dos2unix} program.
|
@code{dos2unix} program.
|
||||||
|
|
||||||
@cindex untranslated file system
|
@cindex untranslated file system
|
||||||
|
|
|
@ -690,8 +690,8 @@ system; for example, to visit a file encoded in codepage 850, type
|
||||||
In addition to converting various representations of non-@acronym{ASCII}
|
In addition to converting various representations of non-@acronym{ASCII}
|
||||||
characters, a coding system can perform end-of-line conversion. Emacs
|
characters, a coding system can perform end-of-line conversion. Emacs
|
||||||
handles three different conventions for how to separate lines in a file:
|
handles three different conventions for how to separate lines in a file:
|
||||||
newline (Unix), carriage-return linefeed (DOS), and just
|
newline (Unix), carriage return followed by linefeed (DOS), and just
|
||||||
carriage-return (Mac).
|
carriage return (Mac).
|
||||||
|
|
||||||
@table @kbd
|
@table @kbd
|
||||||
@item C-h C @var{coding} @key{RET}
|
@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
|
@code{no-conversion}, which means no conversion of any kind---specifies
|
||||||
how and whether to convert printing characters, but leaves the choice of
|
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.
|
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
|
For example, if the file appears to use the sequence carriage return
|
||||||
linefeed to separate lines, DOS end-of-line conversion will be used.
|
and linefeed to separate lines, DOS end-of-line conversion will be used.
|
||||||
|
|
||||||
Each of the listed coding systems has three variants, which specify
|
Each of the listed coding systems has three variants, which specify
|
||||||
exactly what to do for end-of-line conversion:
|
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.)
|
on Unix and GNU systems, and macOS.)
|
||||||
|
|
||||||
@item @dots{}-dos
|
@item @dots{}-dos
|
||||||
Assume the file uses carriage-return linefeed to separate lines, and do
|
Assume the file uses carriage return followed by linefeed to separate
|
||||||
the appropriate conversion. (This is the convention normally used on
|
lines, and do the appropriate conversion. (This is the convention
|
||||||
Microsoft systems.@footnote{It is also specified for MIME @samp{text/*}
|
normally used on Microsoft systems.@footnote{It is also specified for
|
||||||
bodies and in other network transport contexts. It is different
|
MIME @samp{text/*} bodies and in other network transport contexts. It
|
||||||
from the SGML reference syntax record-start/record-end format, which
|
is different from the SGML reference syntax record-start/record-end
|
||||||
Emacs doesn't support directly.})
|
format, which Emacs doesn't support directly.})
|
||||||
|
|
||||||
@item @dots{}-mac
|
@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
|
appropriate conversion. (This was the convention used in Classic Mac
|
||||||
OS.)
|
OS.)
|
||||||
@end table
|
@end table
|
||||||
|
@ -859,15 +859,15 @@ the third argument says which coding system to use for these files.
|
||||||
@vindex inhibit-eol-conversion
|
@vindex inhibit-eol-conversion
|
||||||
@cindex DOS-style end-of-line display
|
@cindex DOS-style end-of-line display
|
||||||
Emacs recognizes which kind of end-of-line conversion to use based on
|
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
|
the contents of the file: if it sees only carriage returns, or only
|
||||||
carriage-return linefeed sequences, then it chooses the end-of-line
|
carriage return followed by linefeed sequences, then it chooses the
|
||||||
conversion accordingly. You can inhibit the automatic use of
|
end-of-line conversion accordingly. You can inhibit the automatic use
|
||||||
end-of-line conversion by setting the variable @code{inhibit-eol-conversion}
|
of end-of-line conversion by setting the variable
|
||||||
to non-@code{nil}. If you do that, DOS-style files will be displayed
|
@code{inhibit-eol-conversion} to non-@code{nil}. If you do that,
|
||||||
with the @samp{^M} characters visible in the buffer; some people
|
DOS-style files will be displayed with the @samp{^M} characters
|
||||||
prefer this to the more subtle @samp{(DOS)} end-of-line type
|
visible in the buffer; some people prefer this to the more subtle
|
||||||
indication near the left edge of the mode line (@pxref{Mode Line,
|
@samp{(DOS)} end-of-line type indication near the left edge of the
|
||||||
eol-mnemonic}).
|
mode line (@pxref{Mode Line, eol-mnemonic}).
|
||||||
|
|
||||||
@vindex inhibit-iso-escape-detection
|
@vindex inhibit-iso-escape-detection
|
||||||
@cindex escape sequences in files
|
@cindex escape sequences in files
|
||||||
|
@ -1041,7 +1041,7 @@ buffer (@pxref{Output Coding}).
|
||||||
(@pxref{Coding Systems, end-of-line conversion}) for encoding the
|
(@pxref{Coding Systems, end-of-line conversion}) for encoding the
|
||||||
current buffer. For example, @kbd{C-x @key{RET} f dos @key{RET}} will
|
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
|
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
|
@kindex C-x RET c
|
||||||
@findex universal-coding-system-argument
|
@findex universal-coding-system-argument
|
||||||
|
|
|
@ -205,11 +205,11 @@ terminal output. Furthermore, if you are using an input method,
|
||||||
string is displayed, that indicates a nontrivial end-of-line
|
string is displayed, that indicates a nontrivial end-of-line
|
||||||
convention for encoding a file. Usually, lines of text are separated
|
convention for encoding a file. Usually, lines of text are separated
|
||||||
by @dfn{newline characters} in a file, but two other conventions are
|
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
|
character followed by a linefeed character; when editing such
|
||||||
files, the colon changes to either a backslash (@samp{\}) or
|
files, the colon changes to either a backslash (@samp{\}) or
|
||||||
@samp{(DOS)}, depending on the operating system. Another convention,
|
@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
|
character instead of a newline; when editing such files, the colon
|
||||||
changes to either a forward slash (@samp{/}) or @samp{(Mac)}. On some
|
changes to either a forward slash (@samp{/}) or @samp{(Mac)}. On some
|
||||||
systems, Emacs displays @samp{(Unix)} instead of the colon for files
|
systems, Emacs displays @samp{(Unix)} instead of the colon for files
|
||||||
|
|
|
@ -1074,9 +1074,9 @@ that result from encoding unsupported characters.
|
||||||
used on various systems for representing end of line in files. The
|
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
|
Unix convention, used on GNU and Unix systems, is to use the linefeed
|
||||||
character (also called newline). The DOS convention, used on
|
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
|
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 base coding system
|
||||||
@cindex variant coding system
|
@cindex variant coding system
|
||||||
|
|
|
@ -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
|
For example, @samp{(calc-eval "vx5\rVR+" 'macro)} pushes the
|
||||||
vector @samp{[1,2,3,4,5]} on the stack and then replaces it
|
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
|
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
|
If your keyboard macro wishes to pop the stack, @samp{\C-d} is
|
||||||
safer than @samp{\177} (the @key{DEL} character) because some
|
safer than @samp{\177} (the @key{DEL} character) because some
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue