from trunk

diff --cc src/ChangeLog
index 91db3a3dbae412c200a14d2e969c138ea5172ea8,f5e2393724c7cb27f7bb0d0095b4f1196f3f08b7..72552a34d308829933c71f1ddea88e441d7b5bb4
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
 +2010-01-15  Kenichi Handa  <handa@m17n.org>
 +
 +      * xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS.  Callers changed.
 +
+ 2010-01-15  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * nsterm.m (Qnone): Define.
+ 
+       * nsfns.m (Qnone): Move definition to nsterm.m.
+ 
  2010-01-14  Kenichi Handa  <handa@m17n.org>
  
        * coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding