From 11fc204ebe1f450b7234b9ebc528931cd56aaf43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <mikael.capelle@typename.fr>
Date: Sat, 16 Apr 2016 20:29:38 +0200
Subject: [PATCH] Update init and custom files.

---
 .emacs.d/init.el | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e3f322b..1be8009 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -78,8 +78,7 @@
 (use-package sr-speedbar
   :config
   (setq speedbar-show-unknown-files t)
-  (setq speedbar-use-images nil)
-  (setq sr-speedbar-right-side nil))
+  (setq speedbar-use-images t))
 
 (use-package semantic/sb
   :config
@@ -122,7 +121,7 @@
   (add-hook 'LaTeX-mode-hook 'company-auctex-init)
   (add-hook 'python-mode-hook
             (lambda ()
-              (setq company-backends '(company-jedi))))
+              (setq-local company-backends '(company-jedi))))
   :config
   (add-hook 'after-init-hook 'global-company-mode)
   (global-set-key (kbd "M-/") 'company-complete)
@@ -198,21 +197,23 @@
     :mode "\\.text\\'" "\\.markdown\\'" "\\.md\\'")
 
 ;; White space mode & Fill mode column
-(setq-default fill-column 95)
-(setq whitespace-line-column 95)
+
+(defun my-visual-hook ()
+  (setq-default fill-column 95)
+  (setq-local whitespace-line-column 95)
+  (visual-line-mode t)
+  (visual-fill-column-mode t)
+  (define-key visual-line-mode-map [remap kill-line] nil)
+  (whitespace-mode t))
 
 (add-hook 'before-save-hook 'whitespace-cleanup)
 
-(add-hook 'visual-line-mode-hook 'visual-fill-column-mode)
-(global-visual-line-mode t)
-(define-key visual-line-mode-map [remap kill-line] nil)
+(add-hook 'python-mode-hook (lambda () (setq-local whitespace-line-column 140)))
+(add-hook 'LaTeX-mode-hook (lambda () (setq-local whitespace-line-column -1)))
+(add-hook 'web-mode-hook (lambda () (setq-local whitespace-line-column -1)))
 
-(add-hook 'python-mode-hook (lambda () (setq whitespace-line-column 140)))
-(add-hook 'LaTeX-mode-hook (lambda () (setq whitespace-line-column -1)))
-(add-hook 'web-mode-hook (lambda () (setq whitespace-line-column -1)))
-
-(global-whitespace-mode 1)
-;; (add-hook 'LaTeX-mode-hook 'turn-on-auto-fill)
+(add-hook 'text-mode-hook 'my-visual-hook)
+(add-hook 'prog-mode-hook 'my-visual-hook)
 
 ;; Electric pair mode
 (electric-pair-mode 1)
@@ -325,6 +326,16 @@
 ;;  (add-to-list 'mmm-mode-ext-classes-alist '(html-mode nil embedded-css))
 ;;  (add-to-list 'mmm-mode-ext-classes-alist '(html-mode nil fancy-html)))
 
+;; Term
+
+(setq explicit-shell-file-name "/bin/bash")
+(defun my-term-hook ()
+  (visual-fill-column-mode nil)
+  (visual-line-mode nil))
+(add-hook 'term-load-hook 'my-term-hook)
+(eval-after-load "term"
+  '(define-key term-raw-map (kbd "C-c C-y") 'term-paste))
+
 (setq custom-file "~/.emacs.d/custom.el")
 (load custom-file)
 (put 'narrow-to-region 'disabled nil)