v2.3.0

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### master
 
+### v2.3.0, 2015-06-24
+- update to support \*THE\* latest tmux version
+- bugfix for `prefix + R` key binding
+- fix for tmux 2.0 `default-terminal` option (thanks @kwbr)
+
 ### v2.2.0, 2015-02-10
 - bugfix in `key_binding_not_set`: the regex is now properly detecting key
   bindings with `-r` flag.

sensible.tmux

@@ -4,6 +4,9 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 ALMOST_SENSIBLE_OPTION="@almost-sensible"
 
+# used to match output from `tmux list-keys`
+KEY_BINDING_REGEX="bind-key[[:space:]]\+\(-r[[:space:]]\+\)\?\(-T prefix[[:space:]]\+\)\?"
+
 is_osx() {
 	local platform=$(uname)
 	[ "$platform" == "Darwin" ]
@@ -41,7 +44,7 @@ server_option_value_not_changed() {
 
 key_binding_not_set() {
 	local key="$1"
-	if $(tmux list-keys | grep -q "bind-key[[:space:]]\+\(-r[[:space:]]\+\)\?${key}"); then
+	if $(tmux list-keys | grep -q "${KEY_BINDING_REGEX}${key}[[:space:]]"); then
 		return 1
 	else
 		return 0
@@ -51,7 +54,7 @@ key_binding_not_set() {
 key_binding_not_changed() {
 	local key="$1"
 	local default_value="$2"
-	if $(tmux list-keys | grep -q "bind-key[[:space:]]\+${key}[[:space:]]\+${default_value}"); then
+	if $(tmux list-keys | grep -q "${KEY_BINDING_REGEX}${key}[[:space:]]\+${default_value}"); then
 		# key still has the default binding
 		return 0
 	else
@@ -98,10 +101,14 @@ main() {
 		tmux set-option -g default-command "reattach-to-user-namespace -l $SHELL"
 	fi
 
-	# upgrade $TERM
+	# upgrade $TERM, tmux 1.9
 	if option_value_not_changed "default-terminal" "screen"; then
 		tmux set-option -g default-terminal "screen-256color"
 	fi
+	# upgrade $TERM, tmux 2.0+
+	if server_option_value_not_changed "default-terminal" "screen"; then
+		tmux set-option -s default-terminal "screen-256color"
+	fi
 
 	# emacs key bindings in tmux command prompt (prefix + :) are better than
 	# vi keys, even for vim users
@@ -160,7 +167,7 @@ main() {
 
 	# source `.tmux.conf` file - as suggested in `man tmux`
 	if key_binding_not_set "R"; then
-		tmux bind-key R run-shell -b ' \
+		tmux bind-key R run-shell ' \
 			tmux source-file ~/.tmux.conf > /dev/null; \
 			tmux display-message "Sourced .tmux.conf!"'
 	fi