exot/.emacs.d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: exot:9e1e9767108d5990ca4dc84665cd7c0c9d1e6796
Branches Tags
exot:master
..
compare: exot:5ffdcf2954da2e8db235fd17db0c2a9dd12f2fdf
Branches Tags
exot:master

No commits in common. "9e1e9767108d5990ca4dc84665cd7c0c9d1e6796" and "5ffdcf2954da2e8db235fd17db0c2a9dd12f2fdf" have entirely different histories.
9e1e976710 ... 5ffdcf2954

1 changed files with 2 additions and 9 deletions
Show Stats Expand all files Collapse all files

11
init.el
View File

@ -1516,8 +1516,7 @@ Note that this workaround is incomplete, as explained in this comment."
(use-package diff-hl (use-package diff-hl
:ensure t :ensure t
:commands (global-diff-hl-mode :commands (global-diff-hl-mode
diff-hl-dired-mode) diff-hl-dired-mode))
:autoload (diff-hl-magit-post-refresh))
(use-package ediff (use-package ediff
:init (setq ediff-diff-options "-w" :init (setq ediff-diff-options "-w"
@ -1622,10 +1621,7 @@ Note that this workaround is incomplete, as explained in this comment."
:config (progn :config (progn
(when (fboundp 'global-magit-file-mode) (when (fboundp 'global-magit-file-mode)
(global-magit-file-mode -1)) (global-magit-file-mode -1))
(global-git-commit-mode 1) (global-git-commit-mode 1)))
;; Update diff-hl fringe marks after committing
(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)))
(use-package page-break-lines (use-package page-break-lines
:pin "melpa-stable" :pin "melpa-stable"
@ -1637,9 +1633,6 @@ Note that this workaround is incomplete, as explained in this comment."
transient-values-file (expand-file-name "transient/values.el" emacs-d-userdata) transient-values-file (expand-file-name "transient/values.el" emacs-d-userdata)
transient-history-file (expand-file-name "transient/history.el" emacs-d-userdata))) transient-history-file (expand-file-name "transient/history.el" emacs-d-userdata)))
(use-package vc
:init (setopt vc-git-diff-switches '("--histogram")))
;; * Mail ;; * Mail