home/-shrc

@@ -139,7 +139,7 @@ ll() {
 
 # providing extra functionality {{{2
 
-alias diff="git diff --color=auto --no-ext-diff --no-index --no-prefix"
+alias diff="git diff --color=auto --no-ext-diff --no-index"
 alias gc="git column --mode=dense --padding=2"
 alias counts='find . | wc -l'
 alias nocom='grep -Ev --line-buffered --color=never "^[[:space:]]*(//|#)"'

home/tmux.conf

@@ -12,9 +12,6 @@ bind C-Space send-prefix
 # this also makes hitting Enter exit copy-mode, which is a godsend
 setw -g mode-keys vi
 
-# need this for ctrl+arrows, etc.
-set-option -g xterm-keys on
-
 # remove delay on escape key
 set -sg escape-time 0
 

home/vimrc

@@ -178,15 +178,6 @@ set backspace=eol,start,indent        " make backspace useful
 " tab completion in command-line
 if has('wildmenu') | set wildmenu | endif
 
-if &term =~ '^tmux'
-    " https://unix.stackexchange.com/a/34723
-    " tmux will send xterm-style keys when xterm-keys is on
-    execute "set <xUp>=\e[1;*A"
-    execute "set <xDown>=\e[1;*B"
-    execute "set <xRight>=\e[1;*C"
-    execute "set <xLeft>=\e[1;*D"
-endif
-
 " easy indent/unindent
 nn <tab> >>
 nn <s-tab> <<