diff --git a/.emacs.default b/.emacs.default
index 131b3a7..045fa18 100644
--- a/.emacs.default
+++ b/.emacs.default
@@ -1,7 +1,6 @@
 ;;;                                         ;;;
 ; .emacs for GNU Emacs Koeki-u Generic Users  ;
 ;;;                                         ;;;
-; Last modified Tue Sep  8 11:56:07 2009 on pan
 
 ;;;
 ;; Grobal Settings
@@ -32,11 +31,7 @@
 (cond
  (Emacs-20
   (set-language-environment "japanese")
-  (set-terminal-coding-system 
-    ;; (if (string= (getenv "TERM") "xterm") 'utf-8 'junet)
-    ;;(if (string= (getenv "TERM") "xterm") 'utf-8 'euc-jp)
-    'utf-8
-    )
+  (set-terminal-coding-system 'utf-8)
   (set-buffer-file-coding-system 'utf-8)
   (set-keyboard-coding-system 'utf-8)
   (prefer-coding-system 'utf-8))
@@ -50,7 +45,6 @@
 (or (member my-load-path load-path)
     (setq load-path (cons my-load-path load-path)))
 
-
 ;;;
 ;; text mode
 ;;;
@@ -170,7 +164,9 @@
 	'("\\.cob$"		. cobol-mode)
 	'("\\.as$"		. actionscript-mode)
 	'("\\.pl$"		. cperl-mode)
+	'("\\.py$"		. python-mode)
 	'("\\.texi[^\\.]*$"	. texinfo-mode)
+	'("\\.java"		. java-mode)
 	'("\\.js$"		. javascript-mode))
        default-auto-mode-alist))
 
@@ -428,16 +424,14 @@
 ;; Global
 ;;;
 (load "term/bobcat")
-(cond
- ((and
-   (boundp 'minibuffer-local-filename-completion-map)
-   (boundp 'minibuffer-local-must-match-filename-map))
-  (define-key minibuffer-local-filename-completion-map
-    " " 'minibuffer-complete-word)
-  (define-key minibuffer-local-must-match-filename-map
-    " " 'minibuffer-complete-word)
-  (and (fboundp 'partial-completion-mode) (partial-completion-mode t))
-  (and (fboundp 'terminal-init-bobcat) (terminal-init-bobcat))))
+(if (boundp 'minibuffer-local-filename-completion-map)
+    (define-key minibuffer-local-filename-completion-map
+      " " 'minibuffer-complete-word))
+(if (boundp 'minibuffer-local-must-match-map)
+    (define-key minibuffer-local-must-match-map
+      " " 'minibuffer-complete-word))
+(if (fboundp 'partial-completion-mode) (partial-completion-mode t))
+(if (fboundp 'terminal-init-bobcat) (terminal-init-bobcat))
 
 (put 'narrow-to-region 'disabled nil)
 (require 'windows)