aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2013-07-20 17:41:38 +0200
committerAndreas Schwab2013-07-20 17:41:38 +0200
commit1451928fffb2065a90e3decd0b9ba34d74dcc22b (patch)
treef64167016c0175973ec0f54bb186ae7772d12ed3
parent6496aec9e948e0e5e6646aff408391d78f3516cc (diff)
downloademacs-1451928fffb2065a90e3decd0b9ba34d74dcc22b.tar.gz
emacs-1451928fffb2065a90e3decd0b9ba34d74dcc22b.zip
* international/mule.el (coding-system-iso-2022-flags): Fix last
change.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68ebad48d42..b47dbacd5a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-07-20 Andreas Schwab <schwab@linux-m68k.org>
2
3 * international/mule.el (coding-system-iso-2022-flags): Fix last
4 change.
5
12013-07-20 Kenichi Handa <handa@gnu.org> 62013-07-20 Kenichi Handa <handa@gnu.org>
2 7
3 * international/mule.el (coding-system-iso-2022-flags): Add 8 * international/mule.el (coding-system-iso-2022-flags): Add
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index ea2a0da4abb..11c4db5977d 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -519,7 +519,7 @@ Return -1 if charset isn't an ISO 2022 one."
519 euc-tw-shift 519 euc-tw-shift
520 use-roman 520 use-roman
521 use-oldjis 521 use-oldjis
522 level-4) 522 8-bit-level-4)
523 "List of symbols that control ISO-2022 encoder/decoder. 523 "List of symbols that control ISO-2022 encoder/decoder.
524 524
525The value of the `:flags' attribute in the argument of the function 525The value of the `:flags' attribute in the argument of the function
@@ -583,7 +583,7 @@ If `use-oldjis' is specified, JIS0208-1976 is designated instead of
583JIS0208-1983. 583JIS0208-1983.
584 584
585If `8-bit-level-4' is specified, the decoder assumes the 585If `8-bit-level-4' is specified, the decoder assumes the
586implementation lavel \"4\" for 8-bit codes which means that GL is 586implementation level \"4\" for 8-bit codes which means that GL is
587identified as the single-shift area. The default implementation 587identified as the single-shift area. The default implementation
588level for 8-bit code is \"4A\" which means that GR is identified 588level for 8-bit code is \"4A\" which means that GR is identified
589as the single-shift area.") 589as the single-shift area.")