aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-01-07 14:24:29 +0000
committerJuanma Barranquero2009-01-07 14:24:29 +0000
commited039e6c297cdf9b4ac4d633ad0ec6db8e194bf5 (patch)
treee216effaa05858444cd8041586bb92fa7455c3c6
parent6c791387ae804215875927f3881ff4f4315221c8 (diff)
downloademacs-ed039e6c297cdf9b4ac4d633ad0ec6db8e194bf5.tar.gz
emacs-ed039e6c297cdf9b4ac4d633ad0ec6db8e194bf5.zip
* international/mule.el (define-coding-system): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/international/mule.el11
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 754af3f6ef4..4e0b914d657 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-01-07 Juanma Barranquero <lekktu@gmail.com>
2
3 * international/mule.el (define-coding-system): Doc fix.
4
12009-01-07 Kenichi Handa <handa@m17n.org> 52009-01-07 Kenichi Handa <handa@m17n.org>
2 6
3 * international/mule.el (define-coding-system): Fix docstring 7 * international/mule.el (define-coding-system): Fix docstring
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index fed9eec025b..508b20692f1 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -592,7 +592,7 @@ The remaining arguments must come in pairs ATTRIBUTE VALUE. ATTRIBUTE
592may be any symbol. 592may be any symbol.
593 593
594The following attributes have special meanings. Those labeled as 594The following attributes have special meanings. Those labeled as
595\"(required)\", should not be omitted. 595\"(required)\" should not be omitted.
596 596
597`:mnemonic' (required) 597`:mnemonic' (required)
598 598
@@ -608,7 +608,7 @@ VALUE must be one of `charset', `utf-8', `utf-16', `iso-2022',
608VALUE is the EOL (end-of-line) format of the coding system. It must be 608VALUE is the EOL (end-of-line) format of the coding system. It must be
609one of `unix', `dos', `mac'. The symbol `unix' means Unix-like EOL 609one 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),
611and `mac' means MAC-like EOL \(i.e. single CR). If omitted, on 611and `mac' means Mac-like EOL \(i.e. single CR). If omitted, on
612decoding by the coding system, Emacs automatically detects the EOL 612decoding by the coding system, Emacs automatically detects the EOL
613format of the source text. 613format of the source text.
614 614
@@ -667,7 +667,7 @@ results in a unibyte buffer.
667`:eol-type' 667`:eol-type'
668 668
669VALUE must be `unix', `dos', `mac'. The symbol `unix' means Unix-like 669VALUE must be `unix', `dos', `mac'. The symbol `unix' means Unix-like
670EOL (LF), `dos' means DOS-like EOL (CRLF), and `mac' means MAC-like 670EOL (LF), `dos' means DOS-like EOL (CRLF), and `mac' means Mac-like
671EOL (CR). If omitted, on decoding, the coding system detects EOL 671EOL (CR). If omitted, on decoding, the coding system detects EOL
672format automatically, and on encoding, uses Unix-like EOL. 672format automatically, and on encoding, uses Unix-like EOL.
673 673
@@ -710,7 +710,7 @@ This attribute has a meaning only when `:coding-type' is `iso-2022'.
710`:bom' 710`:bom'
711 711
712This attributes specifies whether the coding system uses a `byte order 712This attributes specifies whether the coding system uses a `byte order
713mark'. VALUE must nil, t, or cons of coding systems whose 713mark'. VALUE must be nil, t, or cons of coding systems whose
714`:coding-type' is `utf-16' or `utf-8'. 714`:coding-type' is `utf-16' or `utf-8'.
715 715
716If the value is nil, on decoding, don't treat the first two-byte as 716If the value is nil, on decoding, don't treat the first two-byte as
@@ -725,7 +725,8 @@ are 0xFF 0xFE, use the cdr part coding system of the value.
725Otherwise, treat them as bytes for a normal character. On encoding, 725Otherwise, treat them as bytes for a normal character. On encoding,
726produce BOM bytes accoding to the value of `:endian'. 726produce BOM bytes accoding to the value of `:endian'.
727 727
728This attribute has a meaning only when `:coding-type' is `utf-16'. 728This attribute has a meaning only when `:coding-type' is `utf-16' or
729`utf-8'.
729 730
730`:endian' 731`:endian'
731 732