Index: tc/configure.in
===================================================================
--- tc/configure.in	(revision 28)
+++ tc/configure.in	(working copy)
@@ -35,6 +35,19 @@
   --with-lispdir=DIR      Emacs Lisp files in DIR,
 lispdir=${withval})
 
+  AC_MSG_RESULT(checking symbol-rev)
+AC_ARG_ENABLE(symbol-rev,
+[AS_HELP_STRING([--enable-symbol-rev],
+                [Includes symbol.rev in bushu.rev Default: none])],
+SYMBOLREV=yes
+if test "${enableval}" = "no"; then
+  AC_MSG_RESULT(1.symbol.rev will be included in bushu.rev:   ${enableval})
+  SYMBOLREV=none
+elif test "${enableval}" != "yes"; then
+  AC_MSG_RESULT(2.symbol.rev will be included in bushu.rev:   ${enableval})
+  SYMBOLREV=${enableval}
+fi)
+
 dnl AC_ARG_WITH(makeinfo,dnl
 dnl   --with-makeinfo         Specify how to build info files,
 dnl  [ MAKEINFO="$withval" ])
@@ -63,6 +76,7 @@
 AC_SUBST(EMACS_PACKAGE_DIR)
 AC_SUBST(MAKEINFO)
 AC_SUBST(EMACS)
+AC_SUBST(SYMBOLREV)
 AC_SUBST(INSTALL)
 AC_SUBST(INSTALLINFO)
 INSTALL_SCRIPT=$INSTALL
@@ -85,13 +99,14 @@
 	  skkinput3/tcinput
          )
 
-AC_MSG_RESULT(" ")
-AC_MSG_RESULT("Sucessfully configured Emacs/tc2")
+AC_MSG_RESULT( )
+AC_MSG_RESULT(Sucessfully configured Emacs/tc2)
 if test -n "$EMACS_PACKAGE_DIR"; then
-   AC_MSG_RESULT("Using package root:                ${EMACS_PACKAGE_DIR}")
+   AC_MSG_RESULT(Using package root:                ${EMACS_PACKAGE_DIR})
 fi
-AC_MSG_RESULT("Emacs/tc2 will be compiled with:    ${EMACS}")
-AC_MSG_RESULT("Lisp files will be installed into:    ${lispdir}")
-AC_MSG_RESULT(" ")
-AC_MSG_RESULT("To finish building Emacs/tc2 type \'make\' now.")
-AC_MSG_RESULT("To install Emacs/tc2 type \'make install\'.")
+AC_MSG_RESULT(Emacs/tc2 will be compiled with:    ${EMACS})
+AC_MSG_RESULT(Lisp files will be installed into:    ${lispdir})
+AC_MSG_RESULT(symbol.rev will be included in bushu.rev:   ${SYMBOLREV})
+AC_MSG_RESULT(  )
+AC_MSG_RESULT(To finish building Emacs/tc2 type 'make' now.)
+AC_MSG_RESULT(To install Emacs/tc2 type 'make install'.)
Index: tc/mazegaki/Makefile.am
===================================================================
--- tc/mazegaki/Makefile.am	(revision 28)
+++ tc/mazegaki/Makefile.am	(working copy)
@@ -14,11 +14,14 @@
              $(DISTDATA)
 
 DICS = greece.maz jukujiku.maz itaiji.maz
+BATCH_SORT       = ../BATCH-SORT
 RM = /bin/rm
 
 mazegaki.dic: $(DICS)
 	$(RM) -f $@
 	$(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-mzdic
+	mv mazegaki.dic mazegaki.dic.tmp
+	$(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file mazegaki.dic.tmp mazegaki.dic
 
 # pd_kihon.yom: step1
 # 	./step2.pl
Index: tc/etc/Makefile.am
===================================================================
--- tc/etc/Makefile.am	(revision 28)
+++ tc/etc/Makefile.am	(working copy)
@@ -4,11 +4,21 @@
 
 pkgdata_DATA = $(DISTDATA) bushu.expand bushu.index2
 EXTRA_DIST = $(DISTDATA) mk-bdic
+BATCH_SORT      = ../BATCH-SORT
+RM		= /bin/rm
 
-bushu.expand bushu.index2: bushu.rev
+bushu.expand bushu.index2: bushu.rev $(BATCH_SORT)
 	@echo '*** compiling bushu dictionary ***'
 	@echo '*** this may take a few minutes ***'
-	$(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-bdic
+.if 	!($(SYMBOLREV),"yes")
+	$(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file bushu.rev bushu.rev.tmp
+	mv bushu.rev.tmp bushu.rev
+.else
+	cat bushu.rev symbol.rev > bushu.rev.tmp
+	$(EMACS) -q -no-site-file -batch -l $(BATCH_SORT) -f batch-sort-file bushu.rev.tmp bushu.rev
+.endif
+	$(EMACS) -q -no-site-file -batch -l $(srcdir)/mk-bdic 
 
+
 clean:
-	$(RM) bushu.expand bushu.index2
+	$(RM) -f bushu.expand bushu.index2
--- /dev/null	2010-07-05 23:28:01.000000000 +0900
+++ tc/BATCH-SORT	2010-07-05 23:28:31.000000000 +0900
@@ -0,0 +1,37 @@
+;  -*- emacs-lisp -*-
+;;; batch-sort-file.el --- 
+
+;; Copyright (C) 2010  Makoto Fujiwara
+
+;; Author: Makoto Fujiwara <makoto@modena.i.ki.nu>
+;; Keywords: 
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+(provide 'batch-sort-file)
+
+(defun batch-sort-file()
+  "Just sort file, important thing is: done by emacs internal code order"
+   (interactive)
+   (set 'in_file (car command-line-args-left))
+   (set 'out_file(car (cdr command-line-args-left)))
+   (message (concat "*** sorting `" in_file "' to `" out_file "' by internal code order"))
+   (insert-file-contents in_file)
+   (sort-lines nil (point-min) (point-max))
+   (write-file out_file)
+)
+;;; batch-sort-file.el ends here
--- tc/lisp/tc.el	2010-04-07 22:04:46.000000000 +0900
+++ tc/lisp/tc.el	2010-05-23 09:04:48.000000000 +0900
@@ -276,7 +276,9 @@
 (defvar tcode-shift-state nil)
 
 (defvar tcode-input-command-list
-  '(c-electric-semi&comma
+  '(asm-colon
+    asm-comment
+    c-electric-semi&comma
     c-electric-slash
     canna-self-insert-command
     digit-argument
@@ -285,8 +287,11 @@
     electric-c-semi
     electric-c-terminator
     electric-perl-terminator
+    perl-electric-terminator
     self-insert-command
     sgml-slash
+    sql-magic-semicolon
+    sql-magic-go
     tcode-electric-comma
     tcode-self-insert-command
     tcode-mazegaki-self-insert-or-convert)
--- tc/lisp/tc-sysdep.el.orig	2010-05-23 09:04:38.000000000 +0900
+++ tc/lisp/tc-sysdep.el	2010-05-23 09:04:48.000000000 +0900
@@ -228,7 +228,7 @@
 ;;;
 ;;; Fix incompatibilities between 18 and 19.
 ;;;
-(if (string-match "^\\(19\\|2[01]\\)" emacs-version)
+(if (string-match "^\\(19\\|2[0-9]\\)" emacs-version)
     (progn
       (defun tcode-redo-command (ch)
 	"キー CH を現在のキーマップで再実行する"