diff options
| author | Paul Eggert | 2011-11-13 20:35:22 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-13 20:35:22 -0800 |
| commit | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (patch) | |
| tree | e707b79a846623490feea39a4dceb86dd218eb4d /src/ChangeLog.9 | |
| parent | 6a0bf43d7c5961297aa5024aec534e5bab73c8af (diff) | |
| parent | 56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff) | |
| download | emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.gz emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog.9')
| -rw-r--r-- | src/ChangeLog.9 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index ceec5da3296..1a4abfab61b 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 | |||
| @@ -4617,7 +4617,7 @@ | |||
| 4617 | * lisp.h (detect_coding_system): Prototype adjusted. | 4617 | * lisp.h (detect_coding_system): Prototype adjusted. |
| 4618 | 4618 | ||
| 4619 | * coding.c (ONE_MORE_BYTE_CHECK_MULTIBYTE): New macro. | 4619 | * coding.c (ONE_MORE_BYTE_CHECK_MULTIBYTE): New macro. |
| 4620 | (detect_coding_emacs_mule, detect_coding_iso2022,) | 4620 | (detect_coding_emacs_mule, detect_coding_iso2022) |
| 4621 | (detect_coding_sjis, detect_coding_big5, detect_coding_utf_8) | 4621 | (detect_coding_sjis, detect_coding_big5, detect_coding_utf_8) |
| 4622 | (detect_coding_utf_16, detect_coding_ccl): Make them static. | 4622 | (detect_coding_utf_16, detect_coding_ccl): Make them static. |
| 4623 | New argument MULTIBYTEP. Callers changed. | 4623 | New argument MULTIBYTEP. Callers changed. |