X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=sugar.git;a=blobdiff_plain;f=dot-files%2F_emacs_el;h=2551a1058d46b8edee1b3c95d745a27ce111cbc4;hp=e75bee5f6a76ee07ac0d9e34fb75ef28ed489412;hb=f27bda9f22cf8b9b60be69d03484f45f2ead887a;hpb=fddbe7252cdac24b9ae84fdaa773a7028db323a9

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index e75bee5..2551a10 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))