From: Xue Fuqiao Date: Sat, 21 Sep 2013 10:58:39 +0000 (+0800) Subject: Add information about carriage-return in lispref. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1489 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=878294497c10c1548fcfde5be3ea2fe35757839e;p=emacs.git Add information about carriage-return in lispref. * doc/lispref/nonascii.texi (Coding System Basics): Add information about carriage-return. --- diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index a1503ea4dde..921e54eb5c1 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2013-09-21 Xue Fuqiao + + * nonascii.texi (Coding System Basics): Add information about carriage-return. + 2013-09-14 Eli Zaretskii * display.texi (Display Margins): State the units of measuring diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index e8e810ce61f..6ae6fa1bf7c 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -962,7 +962,8 @@ 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 linefeed at the end of a line. The Mac convention is to use just -carriage-return. +carriage-return. (This was the convention used on the Macintosh +system prior to OS X.) @cindex base coding system @cindex variant coding system