diff options
| author | Franck Cuny <fcuny@twitter.com> | 2019-07-30 08:50:24 -0700 |
|---|---|---|
| committer | Franck Cuny <fcuny@twitter.com> | 2019-07-30 08:50:24 -0700 |
| commit | 14807afb7dde59af425e34ede5d8b464506b815d (patch) | |
| tree | 0de68b0e4607fd11067fcd15c4c7345c346bf240 | |
| parent | [emacs] configuration for whitespace-mode (diff) | |
| download | emacs.d-14807afb7dde59af425e34ede5d8b464506b815d.tar.gz | |
[emacs] ediff + paren
add configuration for ediff, and update the settings for the paren mode.
| -rw-r--r-- | emacs.d/custom/fcuny-edit.el | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/emacs.d/custom/fcuny-edit.el b/emacs.d/custom/fcuny-edit.el index 8284072..bdbe29b 100644 --- a/emacs.d/custom/fcuny-edit.el +++ b/emacs.d/custom/fcuny-edit.el @@ -25,12 +25,33 @@ :ensure t :custom (show-paren-delay 0) + (show-paren-when-point-inside-paren t) + (show-paren-when-point-in-periphery t) :config (show-paren-mode 1)) -(use-package general +(use-package ediff :config - (general-define-key - "M-j" 'join-line)) + (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) (provide 'fcuny-edit) |