Update init.el and custom.el.

This commit is contained in:
Mikaël Capelle 2016-04-13 09:30:08 +02:00
parent 9d270c3509
commit 7251c4de37
2 changed files with 8 additions and 2 deletions

View File

@ -55,7 +55,7 @@
'(web-mode-html-attr-value-face ((t (:inherit font-lock-string-face :foreground "sea green")))) '(web-mode-html-attr-value-face ((t (:inherit font-lock-string-face :foreground "sea green"))))
'(web-mode-html-tag-face ((t (:foreground "steel blue")))) '(web-mode-html-tag-face ((t (:foreground "steel blue"))))
'(whitespace-line ((t (:background "lightgray" :foreground "dark violet" :init font-lock-warning-face)))) '(whitespace-line ((t (:background "lightgray" :foreground "dark violet" :init font-lock-warning-face))))
'(whitespace-space ((t (:background "white" :foreground "gray"))))) '(whitespace-space ((t (:foreground "gray")))))
(provide 'custom) (provide 'custom)
;;; custom.el ends here ;;; custom.el ends here

View File

@ -185,6 +185,11 @@
(TeX-global-PDF-mode t) (TeX-global-PDF-mode t)
) )
;; magit
(use-package magit
:config
(add-hook 'after-save-hook 'magit-after-save-refresh-status))
;; CSS style ;; CSS style
(setq css-indent-offset 2) (setq css-indent-offset 2)
@ -200,13 +205,14 @@
(add-hook 'visual-line-mode-hook 'visual-fill-column-mode) (add-hook 'visual-line-mode-hook 'visual-fill-column-mode)
(global-visual-line-mode t) (global-visual-line-mode t)
(define-key visual-line-mode-map [remap kill-line] nil)
(add-hook 'python-mode-hook (lambda () (setq whitespace-line-column 140))) (add-hook 'python-mode-hook (lambda () (setq whitespace-line-column 140)))
(add-hook 'LaTeX-mode-hook (lambda () (setq whitespace-line-column -1))) (add-hook 'LaTeX-mode-hook (lambda () (setq whitespace-line-column -1)))
(add-hook 'web-mode-hook (lambda () (setq whitespace-line-column -1))) (add-hook 'web-mode-hook (lambda () (setq whitespace-line-column -1)))
(global-whitespace-mode 1) (global-whitespace-mode 1)
(add-hook 'LaTeX-mode-hook 'turn-on-auto-fill) ;; (add-hook 'LaTeX-mode-hook 'turn-on-auto-fill)
;; Electric pair mode ;; Electric pair mode
(electric-pair-mode 1) (electric-pair-mode 1)