Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index bdf6fd17990e438fc62162090b66214f056ab5aa..d6b045fde3f564720e1da0b1958e424083c67d48 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -163,6 +163,8 @@
 
 ;; session
 (require-if-present 'session)
 
 ;; session
 (require-if-present 'session)

+(if (featurep 'session)
+    (session-initialize))

 
 ;; mediawiki
 (require-if-present 'mediawiki)
 
 ;; mediawiki
 (require-if-present 'mediawiki)


@@ -420,21 +422,23 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (setq erlang-electric-commands nil)
 
 ;; SKK
 (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)
 
 ;; navi2ch
 (autoload 'navi2ch "navi2ch" "Navigator for 2ch for Emacs" t)


@@ -690,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))))
  '(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)
  '(nxml-auto-insert-xml-declaration-flag t)
  '(nxml-slash-auto-complete-flag t)
  '(org-replace-disputed-keys t)


@@ -713,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)
  '(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))
  '(tramp-completion-reread-directory-timeout 2 nil (tramp))
  '(tramp-default-host "localhost" nil (tramp))
  '(tramp-default-method "sshx" nil (tramp))