From: Kenichi Handa <handa@m17n.org>
Date: Fri, 20 May 2011 00:54:09 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~237
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e23640bb698b291866717eef3e6b4c444b3fc26a;p=emacs.git

merge trunk
---

e23640bb698b291866717eef3e6b4c444b3fc26a
diff --cc src/ChangeLog
index 79e5bf677f6,ba84d2d2700..989ecce9d2a
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,21 +1,25 @@@
- 2011-05-20  handa  <handa@m17n.org>
++2011-05-20 Kenichi Handa  <handa@m17n.org>
 +
 +	* composite.c (find_automatic_composition): Fix previous change.
 +
+ 2011-05-20  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* lisp.mk: New file, split from Makefile.in.
+ 	* Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@.
+ 	(shortlisp): Remove.
+ 	($(etc)/DOC): Edit lisp.mk rather than using $shortlisp.
+ 
+ 2011-05-19  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
+ 	(REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
+ 	(BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove.
+ 	(lisp): Set the order to that of loadup.el.
+ 	(shortlisp): Make it a copy of $lisp.
+ 	(SOME_MACHINE_LISP): Remove.
+ 	($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too.
+ 	Use just $shortlisp, not $SOME_MACHINE_LISP too.
+ 
  2011-05-18  Kenichi Handa  <handa@m17n.org>
  
  	* composite.c (CHAR_COMPOSABLE_P): Add more check for efficiency.