summaryrefslogtreecommitdiff
path: root/settings
diff options
context:
space:
mode:
authorbenj <benj@rse8.com>2018-02-21 13:17:28 -0800
committerbenj <benj@rse8.com>2018-02-21 13:17:28 -0800
commit013801a9d3630c6a12a6cc2b04f657f0bcee4a5a (patch)
tree89b9fc414935664bba274318a3338bd1dadfd1e6 /settings
parentfabe4becd22fd41105ea8e51c1f149d2e2bd53e6 (diff)
downloademacs-013801a9d3630c6a12a6cc2b04f657f0bcee4a5a.tar
emacs-013801a9d3630c6a12a6cc2b04f657f0bcee4a5a.tar.gz
emacs-013801a9d3630c6a12a6cc2b04f657f0bcee4a5a.tar.bz2
emacs-013801a9d3630c6a12a6cc2b04f657f0bcee4a5a.tar.lz
emacs-013801a9d3630c6a12a6cc2b04f657f0bcee4a5a.tar.xz
emacs-013801a9d3630c6a12a6cc2b04f657f0bcee4a5a.tar.zst
emacs-013801a9d3630c6a12a6cc2b04f657f0bcee4a5a.zip
updated multiple cursors arrow key command based on OS
Diffstat (limited to '')
-rw-r--r--settings/setup-js-mode.el10
-rw-r--r--settings/setup-multiple-cursors.el10
2 files changed, 8 insertions, 12 deletions
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 <C-up>") 'mc/edit-lines)
-(global-set-key (kbd "C-c <down>") 'mc/mark-all-like-this)
+(if (equal system-type 'darwin)
+ (progn
+ (global-set-key (kbd "C-c <up>") 'mc/edit-lines)
+ (global-set-key (kbd "C-c <down>" ) 'mc/mark-all-like-this))
+ (progn
+ (global-set-key (kbd "C-c <C-up>") 'mc/edit-lines)
+ (global-set-key (kbd "C-c <C-down>" ) 'mc/mark-all-like-this)))
+
(global-set-key (kbd "C-c <C-right>") 'mc/mark-next-like-this)
(global-set-key (kbd "C-c <C-left>") 'mc/mark-previous-like-this)
(global-set-key (kbd "M-s m") 'mc/mark-all-in-eval)