aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorMiles Bader2008-01-31 13:49:17 +0000
committerMiles Bader2008-01-31 13:49:17 +0000
commit6498c4b170e8a143f02913ec523e3b84ab11790c (patch)
tree1182b5d4a6adeb1c917df4c26972374ecd9fd2d1 /src/ChangeLog
parent4efcc8d152908c623a964d591c71bcce54541263 (diff)
parent94cc397c541f50af6b049af6c42806daa2be2709 (diff)
downloademacs-6498c4b170e8a143f02913ec523e3b84ab11790c.tar.gz
emacs-6498c4b170e8a143f02913ec523e3b84ab11790c.zip
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-328
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 0645765cdde..a9404d8bd58 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-01-31 Kenichi Handa <handa@ni.aist.go.jp>
2
3 * keyboard.c (make_ctrl_char): If C is a multibyte character, just
4 return it ORed with ctrl_modifier.
5
12008-01-29 Miles Bader <miles@gnu.org> 62008-01-29 Miles Bader <miles@gnu.org>
2 7
3 * macterm.c (XTset_vertical_scroll_bar): Fix merge mistake. 8 * macterm.c (XTset_vertical_scroll_bar): Fix merge mistake.