From 013801a9d3630c6a12a6cc2b04f657f0bcee4a5a Mon Sep 17 00:00:00 2001 From: benj Date: Wed, 21 Feb 2018 13:17:28 -0800 Subject: updated multiple cursors arrow key command based on OS --- init.el | 2 +- settings/setup-js-mode.el | 10 ---------- settings/setup-multiple-cursors.el | 10 ++++++++-- 3 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 settings/setup-js-mode.el diff --git a/init.el b/init.el index 4071c48..9eb9f95 100644 --- a/init.el +++ b/init.el @@ -85,7 +85,6 @@ (require 'setup-web-mode) (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) @@ -94,3 +93,4 @@ (put 'downcase-region 'disabled nil) (put 'upcase-region 'disabled nil) (put 'narrow-to-region 'disabled nil) +;;; init.el ends here diff --git a/settings/setup-js-mode.el b/settings/setup-js-mode.el deleted file mode 100644 index a3434fc..0000000 --- a/settings/setup-js-mode.el +++ /dev/null @@ -1,10 +0,0 @@ -(require 'js2-mode) - -(add-hook 'js2-mode-hook 'ac-js2-mode) -(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) - -(custom-set-variables - '(js2-basic-offset 2) - '(js2-bounce-indent-p t)) - -(provide 'setup-js-mode) diff --git a/settings/setup-multiple-cursors.el b/settings/setup-multiple-cursors.el index 4df653d..fdfef8d 100644 --- a/settings/setup-multiple-cursors.el +++ b/settings/setup-multiple-cursors.el @@ -1,5 +1,11 @@ -(global-set-key (kbd "C-c ") 'mc/edit-lines) -(global-set-key (kbd "C-c ") 'mc/mark-all-like-this) +(if (equal system-type 'darwin) + (progn + (global-set-key (kbd "C-c ") 'mc/edit-lines) + (global-set-key (kbd "C-c " ) 'mc/mark-all-like-this)) + (progn + (global-set-key (kbd "C-c ") 'mc/edit-lines) + (global-set-key (kbd "C-c " ) 'mc/mark-all-like-this))) + (global-set-key (kbd "C-c ") 'mc/mark-next-like-this) (global-set-key (kbd "C-c ") 'mc/mark-previous-like-this) (global-set-key (kbd "M-s m") 'mc/mark-all-in-eval) -- cgit v1.2.3