Remove join-line binding, remove mouse-avoidance-mode

diff --git a/bindings.el b/bindings.el
index a801509ef767724ded8330c5aafb43aa39baeb38..bfd67292fef0ffd1dba1d4834e4a092eb9570684 100644 (file)
--- a/bindings.el
+++ b/bindings.el
@@ -19,7 +19,6 @@
 ;; OVERRIDES
 (global-set-key [remap move-beginning-of-line] 'smart-beginning-of-line)
 (global-set-key (kbd "M-j") 'backward-join-line)
-(global-set-key (kbd "M-S-j") 'join-line)
 (global-set-key (kbd "C-S-k") 'kill-whole-line)
 (global-set-key (kbd "C-o") 'open-line-below)
 (global-set-key (kbd "M-o") 'open-line-above)

diff --git a/setq-defaults.el b/setq-defaults.el
index 1ea5dc5b569a7b89af91e1f219e95f3e5b99ec62..26d2ef535ec67a6a037a385b7eecf860a6ac51eb 100644 (file)
--- a/setq-defaults.el
+++ b/setq-defaults.el
@@ -33,7 +33,7 @@
 (show-paren-mode t)
 (auto-fill-mode t)
 (midnight-mode t)
-(mouse-avoidance-mode 'animate)
+;;(mouse-avoidance-mode 'animate)
 (column-number-mode t)
 (delete-selection-mode t)
 (global-hl-line-mode t)