aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-02 23:40:04 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-02 23:40:04 +1200
commita9812cb4e449ac5c2dfa75dbfada5852ab63b55f (patch)
tree056bea26277072aa5235b65b97f6aa350e36a2b7
parentMerge branch 'hotfix/v8.22.2' (diff)
parentBump VERSION (diff)
downloaddotfiles-a9812cb4e449ac5c2dfa75dbfada5852ab63b55f.tar.gz
dotfiles-a9812cb4e449ac5c2dfa75dbfada5852ab63b55f.zip
Merge branch 'release/v8.23.0'v8.23.0
* release/v8.23.0: Don't use tmux terminfo file for now Force unwanted --quoting-style option to ls(1) off Bump updated date for vimrc
-rw-r--r--VERSION4
-rw-r--r--terminfo/tmux-256color.ti6
-rw-r--r--terminfo/tmux.ti104
-rw-r--r--tmux/tmux.conf2
4 files changed, 3 insertions, 113 deletions
diff --git a/VERSION b/VERSION
index af856bec..b9757eea 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v8.22.2
-Thu, 30 Apr 2020 03:57:57 +0000
+tejr dotfiles v8.23.0
+Sat, 02 May 2020 11:39:33 +0000
diff --git a/terminfo/tmux-256color.ti b/terminfo/tmux-256color.ti
deleted file mode 100644
index a242b7c1..00000000
--- a/terminfo/tmux-256color.ti
+++ /dev/null
@@ -1,6 +0,0 @@
-tmux-256color| tmux with 256 colors,
- use=tmux,
- colors#256,
- pairs#32767,
- setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
- setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
diff --git a/terminfo/tmux.ti b/terminfo/tmux.ti
deleted file mode 100644
index fc86d773..00000000
--- a/terminfo/tmux.ti
+++ /dev/null
@@ -1,104 +0,0 @@
-tmux| tmux terminal multiplexer,
- acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- am,
- bel=^G,
- blink=\E[5m,
- bold=\E[1m,
- cbt=\E[Z,
- civis=\E[?25l,
- clear=\E[H\E[J,
- cnorm=\E[34h\E[?25h,
- colors#8,
- cols#80,
- cr=^M,
- csr=\E[%i%p1%d;%p2%dr,
- cub1=^H,
- cub=\E[%p1%dD,
- cud1=^J,
- cud=\E[%p1%dB,
- cuf1=\E[C,
- cuf=\E[%p1%dC,
- cup=\E[%i%p1%d;%p2%dH,
- cuu1=\EM,
- cuu=\E[%p1%dA,
- cvvis=\E[34l,
- dch1=\E[P,
- dch=\E[%p1%dP,
- dim=\E[2m,
- dl1=\E[M,
- dl=\E[%p1%dM,
- dsl=\E]0;\007,
- ed=\E[J,
- el1=\E[1K,
- el=\E[K,
- enacs=\E(B\E)0,
- flash=\Eg,
- fsl=^G,
- home=\E[H,
- hs,
- ht=^I,
- hts=\EH,
- ich=\E[%p1%d@,
- il1=\E[L,
- il=\E[%p1%dL,
- ind=^J,
- is2=\E)0,
- it#8,
- kbs=\177,
- kcbt=\E[Z,
- kcub1=\EOD,
- kcud1=\EOB,
- kcuf1=\EOC,
- kcuu1=\EOA,
- kdch1=\E[3~,
- kend=\E[4~,
- kf10=\E[21~,
- kf11=\E[23~,
- kf12=\E[24~,
- kf1=\EOP,
- kf2=\EOQ,
- kf3=\EOR,
- kf4=\EOS,
- kf5=\E[15~,
- kf6=\E[17~,
- kf7=\E[18~,
- kf8=\E[19~,
- kf9=\E[20~,
- khome=\E[1~,
- kich1=\E[2~,
- km,
- kmous=\E[M,
- knp=\E[6~,
- kpp=\E[5~,
- lines#24,
- mir,
- msgr,
- nel=\EE,
- op=\E[39;49m,
- pairs#64,
- rc=\E8,
- rev=\E[7m,
- ri=\EM,
- ritm=\E[23m,
- rmacs=^O,
- rmcup=\E[?1049l,
- rmir=\E[4l,
- rmkx=\E[?1l\E>,
- rmso=\E[27m,
- rmul=\E[24m,
- rs2=\Ec\E[?1000l\E[?25h,
- sc=\E7,
- setab=\E[4%p1%dm,
- setaf=\E[3%p1%dm,
- sgr0=\E[m\017,
- sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
- sitm=\E[3m,
- smacs=^N,
- smcup=\E[?1049h,
- smir=\E[4h,
- smkx=\E[?1h\E=,
- smso=\E[7m,
- smul=\E[4m,
- tbc=\E[3g,
- tsl=\E]0;,
- xenl,
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 257cee5f..2eb1665a 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 'tmux-256color'
+set-option -g default-terminal 'screen-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