X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=8bc9e204a81daecf00d95be115c053ac3b12adc2;hb=67cf5d8c6d79e31be1a6d8ea3ce2fc30053620f0;hp=bdf6fd17990e438fc62162090b66214f056ab5aa;hpb=6eae6baf22a4882cc5a9a7dc31fef2341a61173e;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index bdf6fd1..8bc9e20 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -1,11 +1,17 @@
 ;; -*- Mode: emacs-lisp; Coding: utf-8 -*-
 
+;; Added by Package.el.  This must come before configurations of
+;; installed packages.  Don't delete this line.  If you don't want it,
+;; just comment it out by adding a semicolon to the start of the line.
+;; You may delete these explanatory comments.
+(package-initialize)
+
 ;; Load paths -----------------------------------------------------------------
 (add-to-list 'load-path (expand-file-name "~/.elisp"))
 (add-to-list 'load-path "/usr/local/share/emacs/site-lisp")
 
 ;; Setting for encodings of the environment -----------------------------------
-;(set-language-environment 'Japanese)
+(set-locale-environment "en_US.UTF-8")
 (set-default-coding-systems 'utf-8)
 (set-terminal-coding-system 'utf-8)
 (setq default-file-name-coding-system 'utf-8)
@@ -141,15 +147,27 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
+;; cmake
+(autoload 'cmake-mode "cmake-mode" nil t)
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
+
 ;; ditz
 (require-if-present 'ditz)
 
+;; flycheck
+(require-if-present 'flycheck)
+(if (featurep 'flycheck)
+    (global-flycheck-mode))
+
+(require-if-present 'flycheck-inline)
+(if (featurep 'flycheck-inline)
+    (with-eval-after-load 'flycheck
+      (add-hook 'flycheck-mode-hook #'flycheck-inline-mode)))
+
 ;; flyspell
 (require-if-present 'flyspell)
 
-;; jaspace
-(require-if-present 'jaspace)
-
 ;; glsl
 (autoload 'glsl-mode "glsl-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode))
@@ -157,12 +175,27 @@
 (add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode))
 (add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode))
 
+;; jaspace
+(require-if-present 'jaspace)
+
+;; pkgdiff
+(add-to-list 'load-path "~/sandbox/_editors/emacs-pkgdiff")
+(autoload 'pkgvi "pkgdiff" "Edit a copy of specified file." t)
+(autoload 'pkgdiff "pkgdiff" "Show differences from a backup file." t)
+
 ;; rust
 (autoload 'rust-mode "rust-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
 
+(require-if-present 'flycheck-rust)
+(if (featurep 'flycheck-rust)
+    (with-eval-after-load 'rust-mode
+      (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)))
+
 ;; session
 (require-if-present 'session)
+(if (featurep 'session)
+    (session-initialize))
 
 ;; mediawiki
 (require-if-present 'mediawiki)
@@ -280,28 +313,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
 
 ;; ECB
 (require-if-present 'ecb-autoloads)
-(let* ((hosts '(("netbsd." .
-                 (("~/sandbox/yxmimeproc" "yxmimeproc")
-                  ("~/sandbox/YxMIME" "YxMIME.pm")
-                  ))
-                ("g1.cuenote.jp" .
-                 (("~/sandbox/MR/engine/libycom" "libycom")
-                  ))
-                ("aria.cielonegro.org" .
-                 (("~/sandbox/_web-app/Rakka"           "Rakka")
-                  ("~/sandbox/_haskell/Lucu"            "Lucu")
-                  ("~/sandbox/_web-app/Kirschbaum"      "Kirschbaum")
-                  ("~/sandbox/_haskell/HsOpenSSL"       "HsOpenSSL")
-                  ("~/sandbox/_haskell/HsHyperEstraier" "HsHyperEstraier")
-                  ("~/sandbox/_haskell/HsSVN"           "HsSVN")
-                  ("~/sandbox/_game/RoRo"               "RoRo")
-                  ("~/sandbox/_haskell/HXT"             "HXT")
-                  ("~/sandbox/_haskell/hxt-compile"     "hxt-compile")
-                  ("~/src/ghc-6.10.1"                   "ghc-6.10.1")
-                  ("~/sandbox/sugar"                    "sugar")
-                  ("~/sandbox/_haskell/dns"             "dns")
-                  ("~/sandbox/_haskell/blackboard-ddns" "blackboard-ddns")
-                  ))))
+(let* ((hosts '( ("yukari.cielonegro.org" .
+                  ( ("~/sandbox/_games/acid-rain" "acid rain")
+                    ("~/sandbox/_games/Natural-Mystic-Shaders" "Natural Mystic")
+                    ))))
        (paths (cdr (assoc (system-name) hosts))))
   (setq ecb-source-path paths))
 
@@ -372,7 +387,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
           ))
 
 ;; Haskell
-(load-if-present "haskell-site-file.el")
+(autoload 'haskell-mode "haskell-mode"
+  "Major mode for editing Haskell scripts." t)
+(autoload 'literate-haskell-mode "haskell-mode"
+  "Major mode for editing literate Haskell scripts." t)
 
 (autoload 'run-haskell "inf-haskell" "" t)
 (autoload 'switch-to-haskell "inf-haskell" "" t)
@@ -420,21 +438,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)
@@ -552,9 +572,6 @@ Will prompt you shell name when you type `C-u' before this command." t)
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(Info-additional-directory-list
-   (quote
-    ("/sw/share/info" "/usr/local/info" "/usr/local/share/info")))
  '(ac-ignore-case nil)
  '(appt-display-format (quote window))
  '(appt-message-warning-time 20)
@@ -579,12 +596,12 @@ Will prompt you shell name when you type `C-u' before this command." t)
       (left-fringe))))
  '(ditz-find-issue-directory-automatically-flag t)
  '(ecb-add-path-for-not-matching-files (quote (t)))
- '(ecb-help-info-path "/sw/share/info/ecb.info")
- '(ecb-layout-name "left14")
- '(ecb-options-version "2.32")
+ '(ecb-help-info-path "/usr/pkg/info/ecb.info")
+ '(ecb-layout-name "left7")
+ '(ecb-options-version "2.50")
  '(ecb-show-sources-in-directories-buffer (quote always))
  '(ecb-tip-of-the-day nil)
- '(ecb-tree-buffer-style (quote ascii-guides))
+ '(ecb-tree-buffer-style (quote image))
  '(ecb-windows-width 0.2)
  '(electric-indent-mode nil)
  '(elscreen-display-tab t)
@@ -690,9 +707,17 @@ 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)
+ '(package-archives
+   (quote
+    (("gnu" . "https://elpa.gnu.org/packages/")
+     ("melpa" . "https://melpa.org/packages/"))))
+ '(package-selected-packages
+   (quote
+    (flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")
  '(riece-layout-alist
@@ -714,10 +739,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(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-completion-reread-directory-timeout 2 nil (tramp))
- '(tramp-default-host "localhost" nil (tramp))
- '(tramp-default-method "sshx" nil (tramp))
+ '(tramp-auto-save-directory "/tmp/tramp-auto-save")
+ '(tramp-completion-reread-directory-timeout 2)
+ '(tramp-default-host "localhost")
+ '(tramp-default-method "sshx")
  '(uniquify-buffer-name-style (quote forward) nil (uniquify))
  '(uniquify-trailing-separator-p t)
  '(vc-cvs-diff-switches (quote ("-u")))