aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorMiles Bader2008-01-31 11:35:46 +0000
committerMiles Bader2008-01-31 11:35:46 +0000
commit94cc397c541f50af6b049af6c42806daa2be2709 (patch)
tree0ddf19cca2e3fb64ab0247133ec42fea91396d9a /src/ChangeLog
parent8d99a0b354137e307fc729ec31cd65088e324adf (diff)
parent01e573290dceccfe5d79cb72abf4a7140226fc3f (diff)
downloademacs-94cc397c541f50af6b049af6c42806daa2be2709.tar.gz
emacs-94cc397c541f50af6b049af6c42806daa2be2709.zip
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1028
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.