X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=b5da3ea00a58bff1d3cfd344fda4e8f984de9aa0;hb=d0dd2d8655d45948f4c4eb1eddb007ddd7b2affc;hp=d10f81dfb5c9944e85072c6ee09f6464fa9cd808;hpb=4bdb1b28518dd14560d09e7e7e222fc9e8ea5848;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index d10f81d..b5da3ea 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -11,7 +11,7 @@
 (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)
@@ -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))
@@ -385,7 +390,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)
@@ -596,7 +604,7 @@ Will prompt you shell name when you type `C-u' before this command." 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-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))
@@ -713,6 +721,7 @@ 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)))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")
  '(riece-layout-alist
@@ -734,8 +743,8 @@ 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-auto-save-directory "/tmp/tramp-auto-save")
+ '(tramp-completion-reread-directory-timeout 2)
  '(tramp-default-host "localhost" nil (tramp))
  '(tramp-default-method "sshx" nil (tramp))
  '(uniquify-buffer-name-style (quote forward) nil (uniquify))