diff options
| author | Eli Zaretskii | 2013-04-24 22:12:03 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-24 22:12:03 +0300 |
| commit | 2800c4d3155df0768410a675359fb360dfe2e791 (patch) | |
| tree | 26f88ac8793567324f8860b616fa5dc674945e22 /src/ChangeLog | |
| parent | 54ab7d34c56aca38b600cdc3e37fc215e7abec06 (diff) | |
| parent | 6139439fac7839d2c13ec9c1045b581d3941b2fc (diff) | |
| download | emacs-2800c4d3155df0768410a675359fb360dfe2e791.tar.gz emacs-2800c4d3155df0768410a675359fb360dfe2e791.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 31764cad485..99e2c3d9a84 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-04-24 Kenichi Handa <handa@gnu.org> | ||
| 2 | |||
| 3 | * coding.c (decode_coding_iso_2022): When an invalid escape | ||
| 4 | sequence is encountered, reset the invocation and designation | ||
| 5 | status to the safest one. | ||
| 6 | |||
| 1 | 2013-04-22 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2013-04-22 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * Makefile.in (bootstrap-clean): Remove stamp-h1 too. | 9 | * Makefile.in (bootstrap-clean): Remove stamp-h1 too. |