Merge from emacs--rel--22

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a7c7e1eabe3accea7f7b974a033075da20287c6..448f92cdca5f8a692a2140e5b98d3a7956b46ab2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * term/mac-win.el (mac-ts-active-input-buf): Move defvar to macterm.c.
+
 2008-04-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/easymenu.el (easy-menu-make-symbol): Don't wrap keyboard