merge trunk

diff --cc src/ChangeLog
index 79e5bf677f6be9902e9d1e86e27e5a6a0b170131,ba84d2d27000a996fbbd12d0d9cb2e1236674a80..989ecce9d2a1353e0eacd9a3084a059c6b84663f
--- 1/src/ChangeLog
--- 2/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.