diff options
| author |  Tom Willemse | 2019-02-19 00:53:33 -0800 |
|---|---|---|
| committer | Tom Willemse | 2019-02-19 00:53:33 -0800 |
| commit | fa7536a85dbeb0ff25f3df5ee7ff1694d8c19b56 (patch) | |
| tree | aa223edc722af894db6059d134e77fff3526c97a /emacs | |
| parent | 45ab0967ab0b46ce5d28a3a70d9fb556d105e2e2 (diff) | |
| download | new-dotfiles-fa7536a85dbeb0ff25f3df5ee7ff1694d8c19b56.tar.gz new-dotfiles-fa7536a85dbeb0ff25f3df5ee7ff1694d8c19b56.zip | |
Move diff-hl configuration to emacs-config
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/init.el | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index b9e292d..67a298c 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -49,7 +49,6 @@ (require 'counsel) (require 'destroy-trailing-whitespace) -(require 'diff-hl) (require 'diminish) (require 'ivy) (require 'ivy-hydra) @@ -163,20 +162,8 @@ (add-hook 'electric-indent-local-mode-hook #'oni:switch-newline-keys) -(global-diff-hl-mode) (blink-cursor-mode -1) -(defun oni:with-diff-hl-p4-args (orig-fun &rest args) - "Add Perforce-specific command-line arguments to `diff-hl-mode'. - -ORIG-FUN is the function being wrapped, ARGS are the arguments specified" - (let ((p4-lowlevel-diff-switches '("-du0"))) - (apply orig-fun args))) - -(with-eval-after-load 'vc-p4 - (add-function :around (symbol-function 'diff-hl-changes-buffer) - #'oni:with-diff-hl-p4-args)) - ;; (with-eval-after-load 'server ;; (diminish 'server-buffer-clients ;; (propertize (concat " " (char-to-string #xf233)) |