aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier2010-05-24 20:54:13 -0400
committerStefan Monnier2010-05-24 20:54:13 -0400
commit171eda5358a6c63b4854688a300b0fe22d3fcb38 (patch)
treef502d64f89cd9a59a4c8a0b51324b3eb2e6c8ef5 /src/ChangeLog
parent7eca871a82d582b986c638343f74d16b819a0f14 (diff)
parentdd9b52a6930c42eeefb45938df309bebe9acec37 (diff)
downloademacs-171eda5358a6c63b4854688a300b0fe22d3fcb38.tar.gz
emacs-171eda5358a6c63b4854688a300b0fe22d3fcb38.zip
Merge from emacs-23
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 93f2015b4de..dbd132aa3dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,12 +1,15 @@
12010-05-24 Stefan Monnier <monnier@iro.umontreal.ca> 12010-05-24 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * editfns.c (Fbyte_to_string): New function.
4
52010-05-24 Stefan Monnier <monnier@iro.umontreal.ca>
6
3 * process.c (Fmake_network_process): Set :host to nil if it's not used. 7 * process.c (Fmake_network_process): Set :host to nil if it's not used.
4 Suggested by Masatake YAMATO <yamato@redhat.com>. 8 Suggested by Masatake YAMATO <yamato@redhat.com>.
5 9
62010-05-23 Eli Zaretskii <eliz@gnu.org> 102010-05-23 Eli Zaretskii <eliz@gnu.org>
7 11
8 * dispextern.h (init_iterator): Sync prototype with changed 12 * dispextern.h (init_iterator): Sync prototype with changed definition.
9 definition.
10 13
112010-05-19 Eli Zaretskii <eliz@gnu.org> 142010-05-19 Eli Zaretskii <eliz@gnu.org>
12 15