From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 8 Jan 2025 03:50:53 +0000 (+0100)
Subject: Clarify that 'mac' line ending convention is not used on macOS
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2c308ad934cf6d9cf0a78dffc8bad5bcb2e6c94;p=emacs.git

Clarify that 'mac' line ending convention is not used on macOS

* doc/emacs/mule.texi (Coding Systems):
* doc/lispref/nonascii.texi (Coding System Basics): Clarify that the
'mac' line ending convention is not used on macOS, and is now rare
outside of legacy software.

(cherry picked from commit 002960ceabfb4f91b1bc73a342a9bd5e719e739b)
---

diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 580f8da27d7..4db0febbef8 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -832,7 +832,7 @@ format, which Emacs doesn't support directly.})
 @item @dots{}-mac
 Assume the file uses carriage return to separate lines, and do the
 appropriate conversion.  (This was the convention used in Classic Mac
-OS.)
+OS, but is now rare outside of legacy software.)
 @end table
 
   These variant coding systems are omitted from the
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 448d778f4cb..cbfb1fc243d 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1096,13 +1096,13 @@ that result from encoding unsupported characters.
 @cindex EOL conversion
 @cindex end-of-line conversion
 @cindex line end conversion
-  @dfn{End of line conversion} handles three different conventions
-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
+  @dfn{End of line conversion} handles three different conventions used
+on various systems for representing end of line in files.  The Unix
+convention, used on GNU and Unix systems, and macOS, 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.  (This was the convention used in Classic Mac OS.)
+linefeed.  The Mac convention, used in Classic Mac OS and now rare
+outside of legacy software, is to use just carriage return.
 
 @cindex base coding system
 @cindex variant coding system