summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs2
-rw-r--r--.emacs-custom.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/.emacs b/.emacs
index f7bb6d2..8ad66d5 100644
--- a/.emacs
+++ b/.emacs
@@ -185,6 +185,8 @@
(add-hook 'erc-mode-hook 'my/erc-hook)
+(add-hook 'dired-mode-hook 'diff-hl-dired-mode-unless-remote)
+
;; Helper functions and miscellaneous settings.
diff --git a/.emacs-custom.el b/.emacs-custom.el
index 4936b62..2ef8691 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -11,6 +11,7 @@
'(column-number-mode t)
'(comint-scroll-show-maximum-output nil)
'(delete-selection-mode t)
+ '(diff-hl-flydiff-mode t)
'(dired-listing-switches "-al -Fhv --group-directories-first")
'(ediff-merge-split-window-function (quote split-window-vertically))
'(ediff-split-window-function (quote split-window-horizontally))
@@ -26,6 +27,7 @@
'(git-commit-setup-hook
(quote
(git-commit-save-message git-commit-setup-changelog-support git-commit-turn-on-auto-fill git-commit-turn-on-flyspell git-commit-propertize-diff with-editor-usage-message my/buffer-justify-full)))
+ '(global-diff-hl-mode t)
'(global-page-break-lines-mode t nil (page-break-lines))
'(hscroll-step 1)
'(icomplete-mode t)
@@ -49,7 +51,7 @@
("gnu" . "http://elpa.gnu.org/packages/"))))
'(package-selected-packages
(quote
- (rg delight paradox flycheck magit markdown-mode page-break-lines rust-mode wgrep)))
+ (diff-hl rg delight paradox flycheck magit markdown-mode page-break-lines rust-mode wgrep)))
'(page-break-lines-modes (quote (fundamental-mode text-mode prog-mode special-mode)))
'(paradox-execute-asynchronously t)
'(paradox-github-token t)