aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-18 15:43:11 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-18 15:43:11 +1200
commit5a40aa61d20d7a334461c1e13125b222b149080e (patch)
tree10bb7afb6be0c037c2d480dedf4fdfe401614574
parentMerge branch 'release/v6.24.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-5a40aa61d20d7a334461c1e13125b222b149080e.tar.gz
dotfiles-5a40aa61d20d7a334461c1e13125b222b149080e.zip
Merge branch 'release/v6.25.0'v6.25.0
* release/v6.25.0: Switch to tmux-256color terminal type Adjust comment for POSIXY_CORRECT switch
-rw-r--r--VERSION4
-rw-r--r--tmux/tmux.conf2
-rw-r--r--vim/vimrc.stub.vim4
3 files changed, 5 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index 35fc6507..99a4c6d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.24.0
-Tue, 18 Jun 2019 01:16:26 +0000
+tejr dotfiles v6.25.0
+Tue, 18 Jun 2019 03:43:10 +0000
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 2eb1665a..257cee5f 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -14,7 +14,7 @@ set-option -g update-environment 'COLORFGBG COLORTERM'
set-option -g default-command "$SHELL"
# Expect a 256-color terminal
-set-option -g default-terminal 'screen-256color'
+set-option -g default-terminal 'tmux-256color'
# Change the prefix to ^A rather than the default of ^B, because I'm a godless
# GNU Screen refugee, and also I like using ^B in my shell and in Vim more
diff --git a/vim/vimrc.stub.vim b/vim/vimrc.stub.vim
index b5763f16..25ca7cf8 100644
--- a/vim/vimrc.stub.vim
+++ b/vim/vimrc.stub.vim
@@ -1,5 +1,5 @@
-" If POSIXLY_CORRECT is defined in the environment, we'll start compatible if
-" we're not already planning to do so.
+" If POSIXLY_CORRECT is defined in the environment, we'll start with
+" 'compatible' enabled if we're not already doing so
if exists('$POSIXLY_CORRECT') && !&compatible
set compatible
endif