diff options
| author | Eli Zaretskii | 2010-05-30 22:47:34 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-05-30 22:47:34 +0300 |
| commit | 9e8014c63aac39d5ca9987366ca506ba4d2aaffe (patch) | |
| tree | 33c4915e205bac357a2a01e5179ad8982e865a97 | |
| parent | 6dcfd2538373529448f593d22708917bc03b6bbd (diff) | |
| download | emacs-9e8014c63aac39d5ca9987366ca506ba4d2aaffe.tar.gz emacs-9e8014c63aac39d5ca9987366ca506ba4d2aaffe.zip | |
Fix bug #6313.
lisp/international/mule.el (define-coding-system): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/international/mule.el | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 90b04f6c7c7..0d0eae76851 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-30 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * international/mule.el (define-coding-system): Doc fix (bug#6313). | ||
| 4 | |||
| 1 | 2010-05-30 Juanma Barranquero <lekktu@gmail.com> | 5 | 2010-05-30 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * emulation/cua-base.el: Recognize also `right-word' and `left-word'. | 7 | * emulation/cua-base.el: Recognize also `right-word' and `left-word'. |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index ef3ef1e2efa..a89eaf4a753 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', | |||
| 608 | VALUE is the EOL (end-of-line) format of the coding system. It must be | 608 | VALUE is the EOL (end-of-line) format of the coding system. It must be |
| 609 | one of `unix', `dos', `mac'. The symbol `unix' means Unix-like EOL | 609 | one of `unix', `dos', `mac'. The symbol `unix' means Unix-like EOL |
| 610 | \(i.e. single LF), `dos' means DOS-like EOL \(i.e. sequence of CR LF), | 610 | \(i.e. single LF), `dos' means DOS-like EOL \(i.e. sequence of CR LF), |
| 611 | and `mac' means Mac-like EOL \(i.e. single CR). If omitted, on | 611 | and `mac' means Mac-like EOL \(i.e. single CR). If omitted, Emacs |
| 612 | decoding by the coding system, Emacs automatically detects the EOL | 612 | detects the EOL format automatically when decoding. |
| 613 | format of the source text. | ||
| 614 | 613 | ||
| 615 | `:charset-list' | 614 | `:charset-list' |
| 616 | 615 | ||
| @@ -664,13 +663,6 @@ the coding system is replaced with VALUE. | |||
| 664 | VALUE non-nil means that visiting a file with the coding system | 663 | VALUE non-nil means that visiting a file with the coding system |
| 665 | results in a unibyte buffer. | 664 | results in a unibyte buffer. |
| 666 | 665 | ||
| 667 | `:eol-type' | ||
| 668 | |||
| 669 | VALUE must be `unix', `dos', `mac'. The symbol `unix' means Unix-like | ||
| 670 | EOL (LF), `dos' means DOS-like EOL (CRLF), and `mac' means Mac-like | ||
| 671 | EOL (CR). If omitted, on decoding, the coding system detects EOL | ||
| 672 | format automatically, and on encoding, uses Unix-like EOL. | ||
| 673 | |||
| 674 | `:mime-charset' | 666 | `:mime-charset' |
| 675 | 667 | ||
| 676 | VALUE must be a symbol whose name is that of a MIME charset converted | 668 | VALUE must be a symbol whose name is that of a MIME charset converted |