From: Kenichi Handa <handa@m17n.org>
Date: Fri, 15 Jan 2010 05:13:05 +0000 (+0900)
Subject: from trunk
X-Git-Tag: emacs-pretest-23.1.92~38^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa0cff43e861a49d9f992ffccbe4f71e29d71e1a;p=emacs.git

from trunk
---

fa0cff43e861a49d9f992ffccbe4f71e29d71e1a
diff --cc src/ChangeLog
index 91db3a3dbae,f5e2393724c..72552a34d30
--- a/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