v3.0.0

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ### master
 
+### v3.0.0, 2015-06-24
+- remove 'almost sensible' feature
+
+### 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.

README.md

@@ -76,25 +76,6 @@ allowing you to hold `Ctrl` and repeat `a + p`/`a + n` (if your prefix is
 If prefix is `C-b`, above keys will be `C-b` and `b`.<br/>
 If prefix is `C-z`, above keys will be `C-z` and `z`... you get the idea.
 
-### Almost sensible options - deprecated
-
-**Note**: this feature is deprecated and will be removed from `tmux-sensible`
-in the next major release. The reason for this is to focus this plugin on doing
-just one thing (and hopefully doing it well).<br/>
-If you were using 'almost sensible' the path forward is to move all the
-below options to your `.tmux.conf`.
-
-Activate these by putting `set -g @almost-sensible 'on'` in `.tmux.conf`.
-
-    # C-a should be the Tmux default prefix, really
-    set -g prefix C-a
-    set -g mode-keys vi
-
-    # enable mouse features for terminals that support it
-    set -g mouse-resize-pane on
-    set -g mouse-select-pane on
-    set -g mouse-select-window on
-
 ### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
 
 Add plugin to the list of TPM plugins in `.tmux.conf`:
@@ -118,12 +99,7 @@ Add this line to the bottom of `.tmux.conf`:
 
     run-shell ~/clone/path/sensible.tmux
 
-Reload TMUX environment:
-
-    # type this in terminal
-    $ tmux source-file ~/.tmux.conf
-
-You might also want to restart your tmux server, just in case.
+Reload TMUX environment with `$ tmux source-file ~/.tmux.conf`, and that's it.
 
 ### Other goodies
 

sensible.tmux

@@ -2,7 +2,8 @@
 
 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)
@@ -41,7 +42,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 +52,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
@@ -59,11 +60,6 @@ key_binding_not_changed() {
 	fi
 }
 
-# "almost sensible" is deprecated
-almost_sensible_on() {
-	[ "$(tmux show-option -gvq "$ALMOST_SENSIBLE_OPTION")" == "on" ]
-}
-
 main() {
 	# OPTIONS
 
@@ -98,10 +94,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
@@ -113,19 +113,6 @@ main() {
 	# super useful when using "grouped sessions" and multi-monitor setup
 	tmux set-window-option -g aggressive-resize on
 
-	# ALMOST SENSIBLE OPTIONS - DEPRECATED
-
-	if almost_sensible_on; then
-		# C-a should be the Tmux default prefix, really
-		tmux set-option -g prefix C-a
-		tmux set-option -g mode-keys vi
-
-		# enable mouse features for terminals that support it
-		tmux set-option -g mouse-resize-pane on
-		tmux set-option -g mouse-select-pane on
-		tmux set-option -g mouse-select-window on
-	fi
-
 	# DEFAULT KEY BINDINGS
 
 	local prefix="$(prefix)"
@@ -160,7 +147,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