summaryrefslogtreecommitdiffstats
path: root/emacs/.emacs.d
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-05-05 09:54:21 +0200
committerDavid Robillard <d@drobilla.net>2019-05-05 10:20:50 +0200
commit888849a1204c581aca52a03c3cc03e6fda2aff1c (patch)
treed481575de810ae20f7267f6c9219c52403275e9a /emacs/.emacs.d
parent3ab3d7d45a59011d4110d640cbe19d36f24eace2 (diff)
downloaddotfiles-888849a1204c581aca52a03c3cc03e6fda2aff1c.tar.gz
dotfiles-888849a1204c581aca52a03c3cc03e6fda2aff1c.tar.bz2
dotfiles-888849a1204c581aca52a03c3cc03e6fda2aff1c.zip
Add diff-hl-mode
Diffstat (limited to 'emacs/.emacs.d')
-rw-r--r--emacs/.emacs.d/init.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 1553e67..9ddc324 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -102,6 +102,8 @@
(format "%3d%%%%" (/ (* 100 (- (line-number-at-pos) 1))
(max 1 (count-lines (point-min) (point-max))))))
+(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
+
;;; Variables
(custom-set-variables
@@ -148,8 +150,9 @@
'(fill-column 79)
'(font-lock-maximum-decoration t)
'(frame-background-mode (quote dark))
- '(fringe-mode 0 nil (fringe))
+ '(fringe-mode (quote (nil . 0)) nil (fringe))
'(gc-cons-threshold 10000000)
+ '(global-diff-hl-mode t)
'(grep-find-command
"find . -type f -not -name \"*.svn-base\" -print0 | xargs -0 grep -I -n -s -F ")
'(indicate-empty-lines t)
@@ -204,7 +207,7 @@
'(ns-use-srgb-colorspace nil)
'(package-selected-packages
(quote
- (auctex clang-format counsel-gtags counsel-projectile diminish dired-rainbow exwm flyspell-correct-ivy ggtags git-gutter-fringe glsl-mode ivy llvm-mode magit markdown-mode n3-mode pdf-tools pkgbuild-mode projectile rainbow-delimiters smart-tabs-mode spaceline spaceline-all-the-icons swift-mode ttl-mode use-package)))
+ (apache-mode auctex clang-format cmake-mode counsel-gtags counsel-projectile diff-hl diminish dired-rainbow dockerfile-mode flyspell-correct-ivy ggtags git-gutter-fringe glsl-mode ivy jinja2-mode json-mode llvm-mode magit markdown-mode meson-mode n3-mode pdf-tools pkgbuild-mode projectile rainbow-delimiters rust-mode smart-tabs-mode spaceline swift-mode ttl-mode use-package yaml-mode)))
'(pdf-view-midnight-colors (quote ("#C3D1D1" . "#141414")))
'(powerline-default-separator (quote arrow-fade))
'(projectile-completion-system (quote ivy))