aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2010-01-23 03:49:15 -0500
committerEli Zaretskii2010-01-23 03:49:15 -0500
commit151b77c2684759f6f883c012ce8469b68741b6eb (patch)
treeff092a00d753e8c643512f4de972759e6f11ee86 /src/ChangeLog
parent46ee4cb48102fd75ce20609692a7e3ee058cb630 (diff)
parent3d782998caa47e69de96807eb9deee2b9aa1d9d1 (diff)
downloademacs-151b77c2684759f6f883c012ce8469b68741b6eb.tar.gz
emacs-151b77c2684759f6f883c012ce8469b68741b6eb.zip
Merger from mainline.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5589b7f34a2..62337d8db63 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-01-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * xdisp.c (draw_glyphs): Update `start' for left_overwritten case
4 as in Emacs 22.
5
12010-01-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62010-01-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * lisp.h (make_pure_string): String pointer arg now points to const. 8 * lisp.h (make_pure_string): String pointer arg now points to const.