diff options
| -rw-r--r-- | emacs/init.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/emacs/init.el b/emacs/init.el index 6aaa74e..481935c 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -19,7 +19,6 @@ ;; To disable collection of benchmark data after init is done. (add-hook 'after-init-hook 'benchmark-init/deactivate)) - (defvar surround-keys '("(" "{" "[" "$" "\"" "'")) (defun my/wrap-pair () "Ensure the region is active and then insert-pair." @@ -64,6 +63,7 @@ (modify-syntax-entry ?_ "w") (hs-minor-mode 1) (display-fill-column-indicator-mode 1) + (smerge-mode 1) (add-hook 'before-save-hook (lambda () (unless (elm major-mode my/prog-cleanup-excluded-modes) @@ -977,7 +977,8 @@ changes." (keymap-set my/keys-mode-map "M-U" 'scroll-lock-mode) (keymap-set my/keys-mode-map "M-Q" 'auto-fill-mode) (keymap-set my/keys-mode-map "M-A" 'beginning-of-line-text) -(keymap-set my/keys-mode-map "C-c r" 'raise-sexp) +(keymap-set my/keys-mode-map "C-c R" 'raise-sexp) +(keymap-set my/keys-mode-map "C-c r" 'delete-pair) (keymap-set my/keys-mode-map "M-\"" 'my/activate-mark) (keymap-set my/keys-mode-map "C-x w o" 'my/toggle-window-other-reachability) |