summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ravi-init-navigation.el77
1 files changed, 38 insertions, 39 deletions
diff --git a/lisp/ravi-init-navigation.el b/lisp/ravi-init-navigation.el
index b443e41..b856767 100644
--- a/lisp/ravi-init-navigation.el
+++ b/lisp/ravi-init-navigation.el
@@ -25,31 +25,30 @@
;;; Code:
(use-package region-bindings-mode
+ :bind (:map region-bindings-mode-map
+ ("f" . backward-word)
+ ("b" . forward-word)
+ ;; HJKL cluster to replace arrow keys
+ ("h" . backward-char)
+ ("l" . forward-char)
+ ("k" . previous-line)
+ ("j" . next-line)
+
+ ;; Most of the time, we mark regions to copy
+ ("w" . kill-ring-save)
+
+ ;; Expand yasnippet on a region
+ ("y" . yas-insert-snippet)
+ )
:config
- (progn
- (region-bindings-mode-enable)
- (bind-key "f" 'forward-word region-bindings-mode-map)
- (bind-key "b" 'backward-word region-bindings-mode-map)
-
- ;; HJKL cluster to replace arrow keys
- (bind-key "h" 'backward-char region-bindings-mode-map)
- (bind-key "l" 'forward-char region-bindings-mode-map)
- (bind-key "k" 'previous-line region-bindings-mode-map)
- (bind-key "j" 'next-line region-bindings-mode-map)
-
- ;; Most of the time, we mark regions to copy
- (bind-key "w" 'kill-ring-save region-bindings-mode-map)
-
- ;; Expand yasnippet on a region
- (bind-key "y" 'yas-insert-snippet region-bindings-mode-map)
-
- (defun ravi/is-region-bindings-mode-disabled ()
- (bound-and-true-p ravi/disable-region-bindings-mode))
- (add-to-list 'region-bindings-mode-disable-predicates 'ravi/is-region-bindings-mode-disabled)
- (defun ravi/without-region-bindings-mode (orig-func &rest args)
- (let* ((ravi/disable-region-bindings-mode t)
- (res (apply orig-func args)))
- res))))
+ (region-bindings-mode-enable)
+ (defun ravi/is-region-bindings-mode-disabled ()
+ (bound-and-true-p ravi/disable-region-bindings-mode))
+ (add-to-list 'region-bindings-mode-disable-predicates 'ravi/is-region-bindings-mode-disabled)
+ (defun ravi/without-region-bindings-mode (orig-func &rest args)
+ (let* ((ravi/disable-region-bindings-mode t)
+ (res (apply orig-func args)))
+ res)))
(use-package avy
:bind (("M-H" . avy-goto-word-1)
@@ -148,25 +147,25 @@
("C->" . mc/mark-next-like-this)
("C-<" . mc/mark-previous-like-this)
("C-c C-<" . mc/mark-all-like-this))
+ :commands (mc/mark-more-like-this-extended)
:init
- (progn
- (setq mc/list-file (ravi/emacs-file "past/mc-lists.el"))
+ (setq mc/list-file (ravi/emacs-file "past/mc-lists.el"))
+ (with-eval-after-load "region-bindings-mode"
(bind-key "a" 'mc/mark-all-like-this region-bindings-mode-map)
(bind-key "p" 'mc/mark-previous-like-this region-bindings-mode-map)
(bind-key "n" 'mc/mark-next-like-this region-bindings-mode-map)
- (bind-key "m" 'mc/mark-more-like-this-extended region-bindings-mode-map)
- ))
+ (bind-key "m" 'mc/mark-more-like-this-extended region-bindings-mode-map)))
(use-package fold-this
:commands fold-this
- :config
- (progn
+ :init
+ (with-eval-after-load "region-bindings-mode"
(bind-key "t" 'fold-this region-bindings-mode-map)))
(use-package indirect
:commands indirect-region
- :config
- (progn
+ :init
+ (with-eval-after-load "region-bindings-mode"
(bind-key "I" 'indirect-region region-bindings-mode-map))
:ensure nil)
@@ -181,14 +180,14 @@
(use-package smartparens
:commands (smartparens-mode show-smartparens-mode)
- :init
- (show-smartparens-global-mode 1)
+ :demand t
:config
- (progn
- (require 'smartparens-config)
- (add-hook 'emacs-lisp-mode-hook 'smartparens-mode)
- (add-hook 'emacs-lisp-mode-hook 'sp-use-smartparens-bindings)
- (use-package minor-mode-hack :ensure t)
+ (show-smartparens-global-mode 1)
+ (require 'smartparens-config)
+ (add-hook 'emacs-lisp-mode-hook 'smartparens-mode)
+ (add-hook 'emacs-lisp-mode-hook 'sp-use-smartparens-bindings)
+ (use-package minor-mode-hack :ensure t)
+ (with-eval-after-load "region-bindings-mode"
(raise-minor-mode-map-alist 'region-bindings-mode)))
(use-package corral