summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el6
-rw-r--r--settings/sane-defaults.el7
-rw-r--r--settings/setup-multiple-cursors.el3
3 files changed, 9 insertions, 7 deletions
diff --git a/init.el b/init.el
index 48180c2..6d4c7b7 100644
--- a/init.el
+++ b/init.el
@@ -47,6 +47,8 @@
(load-theme 'solarized-dark))
(require 'setup-package)
+(require 'visual-regexp)
+(require 'visual-regexp-steroids)
(defun init-install-packages()
(packages-install
@@ -122,10 +124,6 @@
(require 'setup-yaml-mode)
(require 'setup-yasnippet)
-(require 'visual-regexp)
-(define-key global-map (kbd "M-&") 'vr/query-replace)
-(define-key global-map (kbd "M-/") 'vr/replace)
-
;; full power
(put 'downcase-region 'disabled nil)
(put 'upcase-region 'disabled nil)
diff --git a/settings/sane-defaults.el b/settings/sane-defaults.el
index 9f3249c..fb433df 100644
--- a/settings/sane-defaults.el
+++ b/settings/sane-defaults.el
@@ -107,11 +107,14 @@
(global-set-key (kbd "C-x C-b") 'ibuffer)
;; swap regexp search and regular search bindings
-(global-set-key (kbd "C-s") 'isearch-forward-regexp)
-(global-set-key (kbd "C-r") 'isearch-backward-regexp)
+(global-set-key (kbd "C-s") 'vr/isearch-forward)
+(global-set-key (kbd "C-r") 'vr/isearch-backward)
(global-set-key (kbd "C-M-s") 'isearch-forward)
(global-set-key (kbd "C-M-r") 'isearch-backward)
+;; replace en masse
+(global-set-key (kbd "S-C-r") 'vr/replace)
+
;; eval mode in region buffer
(global-set-key (kbd "C-c C-e") 'eval-last-sexp)
diff --git a/settings/setup-multiple-cursors.el b/settings/setup-multiple-cursors.el
index e0886ce..f472a75 100644
--- a/settings/setup-multiple-cursors.el
+++ b/settings/setup-multiple-cursors.el
@@ -13,7 +13,8 @@
("l" . mc/edit-lines)
("n" . mc/mark-next-like-this)
("p" . mc/mark-previous-like-this)
- ("r" . mc/mark-all-in-region-regexp)
+ ("r r" . mc/mark-all-in-region-regexp)
+ ("r v" . vr/mc-mark)
("o" . mc/mark-pop)
("s" . mc/sort-regions)
("i" . mc/insert-numbers)))