X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=d6b045fde3f564720e1da0b1958e424083c67d48;hb=ded368b5115a5d78202b110f8e3e0609eba35222;hp=34b7454ccf425af97a8a65fba7a9098258a32d50;hpb=b207f2bb8d21a031e29191329c94560596692e11;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 34b7454..d6b045f 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -119,26 +119,6 @@
              ;;(set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック")
              )))))
 
-;; Hooks for newline-and-indent ------------------------------------------------
-;(mapcar (lambda (hook)
-;     (add-hook hook
-;           (lambda ()
-;             (local-set-key "\C-m" 'newline-and-indent)
-;             (local-set-key "\C-j" 'newline)
-;             )))
-;   '(perl-mode-hook
-;     cperl-mode-hook
-;     java-mode-hook
-;     javascript-mode-hook
-;     c-mode-hook
-;     c++-mode-hook
-;     objc-mode-hook
-;     emacs-lisp-mode-hook
-;     lisp-mode-hook
-;     yatex-mode-hook
-;     css-mode-hook
-;     scheme-mode-hook))
-
 ;; Setting for Packages --------------------------------------------------------
 (defun require-if-present (feature)
   (condition-case e
@@ -183,6 +163,8 @@
 
 ;; session
 (require-if-present 'session)
+(if (featurep 'session)
+    (session-initialize))
 
 ;; mediawiki
 (require-if-present 'mediawiki)
@@ -440,21 +422,23 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (setq erlang-electric-commands nil)
 
 ;; SKK
-(require 'skk-autoloads)
-(require 'skk-study)
-(global-set-key "\C-x\C-j" 'skk-mode)
-(global-set-key "\C-xj" 'skk-auto-fill-mode)
-(global-set-key "\C-xt" 'skk-tutorial)
-(setq skk-use-jisx0201-input-method t)
-(setq skk-rom-kana-rule-list
-      '(("@" nil "@")
-        ("wi" nil ("ヰ" . "ゐ"))
-        ("we" nil ("ヱ" . "ゑ"))
-        ;;("hh" "h" ("ン" . "ん"))
-        ;;("mm" "m" ("ン" . "ん"))
-        ("zx" nil ("ゝ" . "ヽ"))
-        ("zc" nil ("ゞ" . "ヾ"))))
-(set-input-method 'japanese-skk) ; INPUT METHOD
+(require-if-present 'skk-autoloads)
+(if (featurep 'skk-autoloads)
+	(progn
+	  (require-if-present 'skk-study)
+	  (global-set-key "\C-x\C-j" 'skk-mode)
+	  (global-set-key "\C-xj" 'skk-auto-fill-mode)
+	  (global-set-key "\C-xt" 'skk-tutorial)
+	  (setq skk-use-jisx0201-input-method t)
+	  (setq skk-rom-kana-rule-list
+			'(("@" nil "@")
+			  ("wi" nil ("ヰ" . "ゐ"))
+			  ("we" nil ("ヱ" . "ゑ"))
+			  ;;("hh" "h" ("ン" . "ん"))
+			  ;;("mm" "m" ("ン" . "ん"))
+			  ("zx" nil ("ゝ" . "ヽ"))
+			  ("zc" nil ("ゞ" . "ヾ"))))
+	  (set-input-method 'japanese-skk))) ; INPUT METHOD
 
 ;; navi2ch
 (autoload 'navi2ch "navi2ch" "Navigator for 2ch for Emacs" t)
@@ -606,6 +590,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(ecb-tip-of-the-day nil)
  '(ecb-tree-buffer-style (quote ascii-guides))
  '(ecb-windows-width 0.2)
+ '(electric-indent-mode nil)
  '(elscreen-display-tab t)
  '(global-whitespace-mode t)
  '(graphviz-dot-auto-indent-on-newline nil)
@@ -709,6 +694,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(newsticker-url-list-defaults
    (quote
     (("slashdot" "http://slashdot.org/index.rss" nil 3600))))
+ '(ns-command-modifier (quote meta))
  '(nxml-auto-insert-xml-declaration-flag t)
  '(nxml-slash-auto-complete-flag t)
  '(org-replace-disputed-keys t)
@@ -732,8 +718,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(rst-level-face-base-light 50)
  '(safe-local-variable-values (quote ((todo-categories "Todo" "Todo" "Todo" "Todo"))))
  '(select-enable-clipboard t)
- '(session-use-package t nil (session))
- '(tramp-auto-save-directory "/tmp/tramp-auto-save" nil (tramp))
+ '(tramp-auto-save-directory "/tmp/tramp-auto-save")
  '(tramp-completion-reread-directory-timeout 2 nil (tramp))
  '(tramp-default-host "localhost" nil (tramp))
  '(tramp-default-method "sshx" nil (tramp))