[Emacs-diffs] /srv/bzr/emacs/trunk r100486: Fix bug #6313.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100486
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2010-05-30 22:47:34 +0300
message:
  Fix bug #6313.
  
   lisp/international/mule.el (define-coding-system): Doc fix.
modified:
  lisp/ChangeLog
  lisp/international/mule.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-30 18:52:56 +0000
+++ b/lisp/ChangeLog    2010-05-30 19:47:34 +0000
@@ -1,3 +1,7 @@
+2010-05-30  Eli Zaretskii  <address@hidden>
+
+       * international/mule.el (define-coding-system): Doc fix (bug#6313).
+
 2010-05-30  Juanma Barranquero  <address@hidden>
 
        * emulation/cua-base.el: Recognize also `right-word' and `left-word'.

=== modified file 'lisp/international/mule.el'
--- a/lisp/international/mule.el        2010-05-08 18:47:07 +0000
+++ b/lisp/international/mule.el        2010-05-30 19:47:34 +0000
@@ -608,9 +608,8 @@
 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 @@
 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