From 32e9ed963e509eb178bac8da047feea3b0626eaf Mon Sep 17 00:00:00 2001
From: Andrew Lorimer <andrew@lorimer.id.au>
Date: Fri, 7 Jun 2019 15:33:05 +1000
Subject: [PATCH] add tab numbering to vim (and fix merge conflict)

---
 vim/.vimrc | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/vim/.vimrc b/vim/.vimrc
index 1df3167..dbb2096 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -7,3 +7,45 @@ set nu
 set expandtab
 set shiftwidth=2
 set softtabstop=2
+
+if has('gui')
+  set guioptions-=e
+endif
+if exists("+showtabline")
+  function MyTabLine()
+    let s = ''
+    let t = tabpagenr()
+    let i = 1
+    while i <= tabpagenr('$')
+      let buflist = tabpagebuflist(i)
+      let winnr = tabpagewinnr(i)
+      let s .= '%' . i . 'T'
+      let s .= (i == t ? '%1*' : '%2*')
+      let s .= ' ' . i
+      if tabpagewinnr(i,'$') > 1
+        let s .= ':' . winnr . '/' . tabpagewinnr(i,'$')
+      endif
+      let s .= ' %*'
+      let s .= (i == t ? '%#TabLineSel#' : '%#TabLine#')
+      let bufnr = buflist[winnr - 1]
+      let file = bufname(bufnr)
+      let buftype = getbufvar(bufnr, 'buftype')
+      if buftype == 'nofile'
+        if file =~ '\/.'
+          let file = substitute(file, '.*\/\ze.', '', '')
+        endif
+      else
+        let file = fnamemodify(file, ':p:t')
+      endif
+      if file == ''
+        let file = '[No Name]'
+      endif
+      let s .= file
+      let i = i + 1
+    endwhile
+    let s .= '%T%#TabLineFill#%='
+    let s .= (tabpagenr('$') > 1 ? '%999XX' : 'X')
+    return s
+  endfunction
+  set tabline=%!MyTabLine()
+endif
-- 
2.49.0