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

diff --git a/emacs/.emacs b/emacs/.emacs
index b42e49ac4e1f131236309459f96a2cbf4cee90fe..f0348c8bace0ab80ebb6e96df9a793b64ec5593f 100644 (file)
--- 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)