diff options
| author | Franck Cuny <franck.cuny@gmail.com> | 2020-05-10 14:19:42 -0700 |
|---|---|---|
| committer | Franck Cuny <franck.cuny@gmail.com> | 2020-05-10 14:19:42 -0700 |
| commit | de157fc2ee6e2d8b58a175bf5cee9b9fddfd50e1 (patch) | |
| tree | 58b435ab8c90984da7ed70cdda465af02e7f7e38 | |
| parent | [emacs] looks like I forgot this one (diff) | |
| download | emacs.d-de157fc2ee6e2d8b58a175bf5cee9b9fddfd50e1.tar.gz | |
emacs: drop ediff
Diffstat (limited to '')
| -rw-r--r-- | emacs.d/custom/fcuny-edit.el | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/emacs.d/custom/fcuny-edit.el b/emacs.d/custom/fcuny-edit.el index 7c38c28..8ca5214 100644 --- a/emacs.d/custom/fcuny-edit.el +++ b/emacs.d/custom/fcuny-edit.el @@ -5,9 +5,10 @@ (global-auto-revert-mode t)) (use-package whitespace - :hook ((prog-mode . fcuny/whitespace-setup) - (conf-mode-hook . fcuny/whitespace-setup) - (outline-mode-hook . fcuny/whitespace-setup)) + :hook ((prog-mode . fcuny/whitespace-setup) + (conf-mode . fcuny/whitespace-setup) + (outline-mode . fcuny/whitespace-setup) + (yaml-mode . fcuny/whitespace-setup)) :custom (whitespace-style '(face)) @@ -30,28 +31,6 @@ :config (show-paren-mode 1)) -(use-package ediff - :config - (defhydra hydra-ediff (:color blue) - " -^Buffers Files VC Ediff regions ----------------------------------------------------------------------- -_b_uffers _f_iles (_=_) _r_evisions _l_inewise -_B_uffers (3-way) _F_iles (3-way) _w_ordwise - _c_urrent file -" - ("b" ediff-buffers) - ("B" ediff-buffers3) - ("=" ediff-files) - ("f" ediff-files) - ("F" ediff-files3) - ("c" ediff-current-file) - ("r" ediff-revision) - ("l" ediff-regions-linewise) - ("w" ediff-regions-wordwise)) - - (global-set-key (kbd "C-c d") 'hydra-ediff/body)) - (global-set-key (kbd "M-j") 'join-line) ;; don't assume that sentences should have two spaces after period. |