diff options
| author | Kenichi Handa | 2012-10-07 21:48:44 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-07 21:48:44 +0900 |
| commit | 6aa75fb62f6cdc4164d935ef14d57feec5ed6e0a (patch) | |
| tree | f08b19b5df30ac781c914c1d6336fa2a591308c9 | |
| parent | 16ddec7e9e6adcf615db097d9627d490ca29208c (diff) | |
| download | emacs-6aa75fb62f6cdc4164d935ef14d57feec5ed6e0a.tar.gz emacs-6aa75fb62f6cdc4164d935ef14d57feec5ed6e0a.zip | |
international/mule-conf.el (compound-text-with-extensions): Add :mime-charset property as x-ctext.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/international/mule-conf.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87b54707e0a..bc8840819a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-07 Kenichi Handa <handa@gnu.org> | ||
| 2 | |||
| 3 | * international/mule-conf.el (compound-text-with-extensions): Add | ||
| 4 | :mime-charset property as x-ctext. | ||
| 5 | |||
| 1 | 2012-10-06 Ikumi Keita <ikumi@ikumi.que.jp> (tiny change) | 6 | 2012-10-06 Ikumi Keita <ikumi@ikumi.que.jp> (tiny change) |
| 2 | 7 | ||
| 3 | * international/characters.el: Fix simple mistake ((car chars) -> | 8 | * international/characters.el: Fix simple mistake ((car chars) -> |
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 4647b778e59..11207b0b78d 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el | |||
| @@ -1458,7 +1458,8 @@ for decoding and encoding files, process I/O, etc." | |||
| 1458 | :flags '(ascii-at-eol ascii-at-cntl long-form | 1458 | :flags '(ascii-at-eol ascii-at-cntl long-form |
| 1459 | designation locking-shift single-shift) | 1459 | designation locking-shift single-shift) |
| 1460 | :post-read-conversion 'ctext-post-read-conversion | 1460 | :post-read-conversion 'ctext-post-read-conversion |
| 1461 | :pre-write-conversion 'ctext-pre-write-conversion) | 1461 | :pre-write-conversion 'ctext-pre-write-conversion |
| 1462 | :mime-charset 'x-ctext) | ||
| 1462 | 1463 | ||
| 1463 | (define-coding-system-alias | 1464 | (define-coding-system-alias |
| 1464 | 'x-ctext-with-extensions 'compound-text-with-extensions) | 1465 | 'x-ctext-with-extensions 'compound-text-with-extensions) |