Fix EDITOR and tmux.conf for Debian jessie

2 files changed, 2 insertions, 2 deletions

diff --git a/bashrc b/bashrc
index bb9b2be..8aa56fc 100644
--- a/bashrc
+++ b/bashrc
@@ -7,7 +7,7 @@ then
 else 
     if [ -e /usr/bin/vim ]
     then
-		EDITOR=/usr/bin/nvim
+		EDITOR=/usr/bin/vim
     else
 		EDITOR=/usr/bin/vi
     fi
diff --git a/tmux.conf b/tmux.conf
index 8e1fa67..4250e52 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -8,7 +8,7 @@ set -g terminal-overrides 'xterm*:smcup@:rmcup@'
 # Mouse support disabled, depends on tmux version
 #set -g mouse-utf8 on
 #set -g mouse on
-bind -n WheelUpPane copy-mode
+#bind -n WheelUpPane copy-mode
 
 # Act more like vim:
 set-window-option -g mode-keys vi