summaryrefslogtreecommitdiff
path: root/.config/emacs
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-27 17:30:22 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-27 17:30:22 -0400
commit86b1a11dfcbab990a07a236f41deefe0aaf4ed5e (patch)
tree00b1b50d9b616fd1c22ef5c51c007e24d1644ccc /.config/emacs
parent9e79a6c3bbc37c2eec19e055566440f0b1173c5c (diff)
post-merge clean
Diffstat (limited to '.config/emacs')
-rw-r--r--.config/emacs/.gitignore1
-rw-r--r--.config/emacs/init.el6
2 files changed, 3 insertions, 4 deletions
diff --git a/.config/emacs/.gitignore b/.config/emacs/.gitignore
index 0b3a0d4..ef4ec20 100644
--- a/.config/emacs/.gitignore
+++ b/.config/emacs/.gitignore
@@ -7,4 +7,3 @@ server/*
session.*
tramp
url/*
-saves
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 2a7645f..836a53c 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -58,10 +58,10 @@
;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(require 'go-mode-load)
+;(require 'go-mode-load)
-(require 'mailcrypt)
-(mc-setversion "gpg")
+;(require 'mailcrypt)
+;(mc-setversion "gpg")
(add-hook 'wl-summary-mode-hook 'mc-install-read-mode)
(add-hook 'wl-mail-setup-hook 'mc-install-write-mode)