Fix bug #6313.

 lisp/international/mule.el (define-coding-system): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90b04f6c7c721bc430c0ac80582a3c1875d2f617..0d0eae76851ba89307cc20e5aff027917aea2877 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-30  Eli Zaretskii  <eliz@gnu.org>
+
+       * international/mule.el (define-coding-system): Doc fix (bug#6313).
+
 2010-05-30  Juanma Barranquero  <lekktu@gmail.com>
 
        * emulation/cua-base.el: Recognize also `right-word' and `left-word'.

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index ef3ef1e2efa79c92b7b321ac092417b30afd2092..a89eaf4a75346d4d6dffef1361811e8eec5267af 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -608,9 +608,8 @@ VALUE must be one of `charset', `utf-8', `utf-16', `iso-2022',
 VALUE is the EOL (end-of-line) format of the coding system.  It must be
 one of `unix', `dos', `mac'.  The symbol `unix' means Unix-like EOL
 \(i.e. single LF), `dos' means DOS-like EOL \(i.e. sequence of CR LF),
-and `mac' means Mac-like EOL \(i.e. single CR).  If omitted, on
-decoding by the coding system, Emacs automatically detects the EOL
-format of the source text.
+and `mac' means Mac-like EOL \(i.e. single CR).  If omitted, Emacs
+detects the EOL format automatically when decoding.
 
 `:charset-list'
 
@@ -664,13 +663,6 @@ the coding system is replaced with VALUE.
 VALUE non-nil means that visiting a file with the coding system
 results in a unibyte buffer.
 
-`:eol-type'
-
-VALUE must be `unix', `dos', `mac'.  The symbol `unix' means Unix-like
-EOL (LF), `dos' means DOS-like EOL (CRLF), and `mac' means Mac-like
-EOL (CR).  If omitted, on decoding, the coding system detects EOL
-format automatically, and on encoding, uses Unix-like EOL.
-
 `:mime-charset'
 
 VALUE must be a symbol whose name is that of a MIME charset converted