aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2012-01-25 13:55:01 +0800
committerChong Yidong2012-01-25 13:55:01 +0800
commit14af5f7fc4d7557ee712d3b6a8b46d9034c2ff39 (patch)
tree2551c79e5e10f80c99082649b4cf0739c1648c1e /src/ChangeLog
parent0b21c100be8937efef4a5b51c67750c05cfe31e2 (diff)
downloademacs-14af5f7fc4d7557ee712d3b6a8b46d9034c2ff39.tar.gz
emacs-14af5f7fc4d7557ee712d3b6a8b46d9034c2ff39.zip
Merge from emacs-23 branch
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 f9236f159cd..cc149458e02 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-01-25 HIROSHI OOTA <nil@mad.dog.cx> (tiny change)
2
3 * coding.c (encode_designation_at_bol): Change return value to
4 EMACS_INT.
5
12012-01-25 Chong Yidong <cyd@gnu.org> 62012-01-25 Chong Yidong <cyd@gnu.org>
2 7
3 * eval.c (Fuser_variable_p): Doc fix; mention custom-variable-p. 8 * eval.c (Fuser_variable_p): Doc fix; mention custom-variable-p.