diff options
| author | Glenn Morris | 2014-06-28 10:27:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-06-28 10:27:29 -0700 |
| commit | e0d9c3c9a26ba2982595ec2ec4a1167ee7e39ddb (patch) | |
| tree | 263b47445b665a686c37c5c5628f17446a98c3f8 /src/ChangeLog | |
| parent | 14202f05ac84869af2d839ba022ea983b7642770 (diff) | |
| parent | b084415e278d54c6f9ee8406b1af8adc2364576c (diff) | |
| download | emacs-e0d9c3c9a26ba2982595ec2ec4a1167ee7e39ddb.tar.gz emacs-e0d9c3c9a26ba2982595ec2ec4a1167ee7e39ddb.zip | |
Merge from emacs-24; up to 2014-06-12T14:55:48Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2f611365fcd..7f1b3fdf6b8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-06-28 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * coding.c (encode_coding_utf_8): Correctly count produced_chars | ||
| 4 | also in unibyte case. (Bug#17865) | ||
| 5 | |||
| 1 | 2014-06-28 K. Handa <handa@gnu.org> | 6 | 2014-06-28 K. Handa <handa@gnu.org> |
| 2 | 7 | ||
| 3 | * coding.c (MAX_CHARBUF_SIZE): Renamed from CHARBUF_SIZE. | 8 | * coding.c (MAX_CHARBUF_SIZE): Renamed from CHARBUF_SIZE. |