Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index c195311e1c4b80116181b5f451eb9164c061472e..2551a1058d46b8edee1b3c95d745a27ce111cbc4 100644 (file)
--- 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)