From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 7 Nov 2016 19:15:01 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=571b56242d94b9dcfc8156bb71ad8ad1a641a112;hp=9bfd46463d6ccffdfc613150e8afebe0dd63776b;p=max%2Fdotfiles.git

Merge branch 'master' of git.friedersdorff.com:max/dotfiles
---

diff --git a/emacs/.emacs b/emacs/.emacs
index b42e49a..f0348c8 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -57,6 +57,8 @@
 (make-directory "~/.emacs.d/autosaves/" t)
 
 (use-package evil
+  :init
+  (setq evil-want-C-i-jump nil)
   :ensure t
   :config (evil-mode 1))
 
@@ -189,7 +191,8 @@
 		     (smtpmail-smtp-server . "smtp.office365.com")
 		     (smtpmail-smtp-service . 587))))
 
-	mu4e-context-policy 'pick-first))
+	mu4e-context-policy 'pick-first)
+  (setq mu4e-html2text-command "lynx -stdin -dump -force_html"))
 
 
 ;;;(global-company-mode)