X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=0e2ec904e0a2b42e69b8c673c35dc239cdc1b8d0;hb=d77ab549cde9e0b8802122c6fec72a801ab37222;hp=be690294efc78abb8ea9be4b5572b72c42620159;hpb=02fcab9a650e690fc4cfea0a93a71135efba0b5f;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index be69029..0e2ec90 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -158,9 +158,6 @@
 ;; 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))
@@ -168,6 +165,14 @@
 (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))
@@ -293,28 +298,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))
 
@@ -385,7 +372,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)
@@ -567,9 +557,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)
@@ -594,12 +581,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)
@@ -713,7 +700,9 @@ Will prompt you shell name when you type `C-u' before this command." t)
    (quote
     (("gnu" . "https://elpa.gnu.org/packages/")
      ("melpa" . "https://melpa.org/packages/"))))
- '(package-selected-packages (quote (cargo toml-mode rust-mode)))
+ '(package-selected-packages
+   (quote
+    (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
@@ -736,9 +725,9 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(select-enable-clipboard t)
  '(session-use-package t nil (session))
  '(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)
+ '(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")))