aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-01-30 21:43:03 -0500
committerGlenn Morris2014-01-30 21:43:03 -0500
commitf2726fa259eccf31b518f640c5b4076403cdb9f8 (patch)
treebba2782424cfdf823d7c5668e5b7dfb2fdc5fe7e
parentb7e615b9bc17a1e4a9ea0d4a71a87b64152af660 (diff)
downloademacs-f2726fa259eccf31b518f640c5b4076403cdb9f8.tar.gz
emacs-f2726fa259eccf31b518f640c5b4076403cdb9f8.zip
ChangeLog fixes
-rw-r--r--lisp/ChangeLog2
-rw-r--r--src/ChangeLog7
2 files changed, 3 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e8e7a6f3a8..d8e83278d07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4347,7 +4347,7 @@
4347 4347
43482013-10-08 Bastien Guerry <bzg@gnu.org> 43482013-10-08 Bastien Guerry <bzg@gnu.org>
4349 4349
4350 * register.el (insert-register): Fix 2013-10-07T01:28:34Z!sdl.web@gmail.com. 4350 * register.el (insert-register): Fix 2013-10-07 change.
4351 4351
43522013-10-08 Stefan Monnier <monnier@iro.umontreal.ca> 43522013-10-08 Stefan Monnier <monnier@iro.umontreal.ca>
4353 4353
diff --git a/src/ChangeLog b/src/ChangeLog
index f020386dc61..ec17d7ace4f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -18,15 +18,12 @@
18 18
192014-01-27 K. Handa <handa@gnu.org> 192014-01-27 K. Handa <handa@gnu.org>
20 20
21 Fix bug#16286 by the different way than revno:116158 to preserve 21 Fix bug#16286 by a different method from 2014-01-26T00:32:30Z!eggert@cs.ucla.edu,
22 the code detection behavior of 24.3. 22 to preserve the code detection behavior of 24.3.
23
24 * coding.h (struct coding_system): New member detected_utf8_bytes. 23 * coding.h (struct coding_system): New member detected_utf8_bytes.
25
26 * coding.c (detect_coding_utf_8): Set coding->detected_utf8_bytes. 24 * coding.c (detect_coding_utf_8): Set coding->detected_utf8_bytes.
27 (decode_coding_gap): Use short cut for UTF-8 file reading only 25 (decode_coding_gap): Use short cut for UTF-8 file reading only
28 when coding->detected_utf8_bytes equals to coding->src_bytes. 26 when coding->detected_utf8_bytes equals to coding->src_bytes.
29
30 * fileio.c (Finsert_file_contents): Cancel the previous change. 27 * fileio.c (Finsert_file_contents): Cancel the previous change.
31 28
322014-01-29 Martin Rudalics <rudalics@gmx.at> 292014-01-29 Martin Rudalics <rudalics@gmx.at>