diff options
| author | Kenichi Handa | 2013-05-23 21:04:26 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-05-23 21:04:26 +0900 |
| commit | 179a3f11d15cbc6e433f05e03cc7e40fd5ce8362 (patch) | |
| tree | 1ce423b654c3470460625730f3f42585bf5f770f /src/ChangeLog | |
| parent | bc9a50032c477d4276583e66312806540167007d (diff) | |
| parent | 7764286ea69667380175fe156c4e82bf789a1e09 (diff) | |
| download | emacs-179a3f11d15cbc6e433f05e03cc7e40fd5ce8362.tar.gz emacs-179a3f11d15cbc6e433f05e03cc7e40fd5ce8362.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 418a89d7b89..ae311d25ee9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-05-22 Barry OReilly <gundaetiapo@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * casetab.c (init_casetab_once): Fix last change (bug#14424). | ||
| 4 | |||
| 1 | 2013-05-22 Kenichi Handa <handa@gnu.org> | 5 | 2013-05-22 Kenichi Handa <handa@gnu.org> |
| 2 | 6 | ||
| 3 | The following changes are to fix the setting of | 7 | The following changes are to fix the setting of |
| @@ -12,8 +16,8 @@ | |||
| 12 | (setup_coding_system): Do not initialize coding->head_ascii. | 16 | (setup_coding_system): Do not initialize coding->head_ascii. |
| 13 | (check_ascii): Do not set coding->eol_seen but update it. Do not | 17 | (check_ascii): Do not set coding->eol_seen but update it. Do not |
| 14 | call adjust_coding_eol_type here. | 18 | call adjust_coding_eol_type here. |
| 15 | (detect_coding): Fix detection of BOM for utf-8 and utf-16. If | 19 | (detect_coding): Fix detection of BOM for utf-8 and utf-16. |
| 16 | the eol-type of CODING is already specified, adjust the eol type | 20 | If the eol-type of CODING is already specified, adjust the eol type |
| 17 | of the found coding-system. | 21 | of the found coding-system. |
| 18 | (decode_coding_gap): Cancel previous change. Utilize the | 22 | (decode_coding_gap): Cancel previous change. Utilize the |
| 19 | character numbers counted by detect_coding_utf_8. Fix detection | 23 | character numbers counted by detect_coding_utf_8. Fix detection |