From 9e8014c63aac39d5ca9987366ca506ba4d2aaffe Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 30 May 2010 22:47:34 +0300 Subject: Fix bug #6313. lisp/international/mule.el (define-coding-system): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/international/mule.el | 12 ++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 90b04f6c7c..0d0eae7685 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-05-30 Eli Zaretskii + + * international/mule.el (define-coding-system): Doc fix (bug#6313). + 2010-05-30 Juanma Barranquero * emulation/cua-base.el: Recognize also `right-word' and `left-word'. diff --git a/lisp/international/mule.el b/lisp/international/mule.el index ef3ef1e2ef..a89eaf4a75 100644 --- 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 -- cgit v1.2.3