From 3ea5b9f6b9299c4856f2a0b515c219410d1d8014 Mon Sep 17 00:00:00 2001
From: Bruno Sutic <bruno.sutic@gmail.com>
Date: Fri, 8 May 2015 22:33:06 +0200
Subject: [PATCH] Support *the* latest tmux version

---
 CHANGELOG.md  | 1 +
 sensible.tmux | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce63f77..fe736ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ### master
+- update to support \*THE\* latest tmux version
 - bugfix for `prefix + R` key binding
 
 ### v2.2.0, 2015-02-10
diff --git a/sensible.tmux b/sensible.tmux
index 871f0df..11088af 100755
--- a/sensible.tmux
+++ b/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}[[:space:]]"); 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