From 4694ecc6658fa25427abc2aad83d1bbf4abcae2c Mon Sep 17 00:00:00 2001
From: Dmytro Meleshko <dmytro.meleshko@gmail.com>
Date: Mon, 31 May 2021 16:00:43 +0300
Subject: [PATCH] [nvim] retract some hacks in response to
 vim-airline/vim-airline@1f94ec1556db36088897c85db62251b62b683ab3

---
 nvim/autoload/airline/extensions/dotfiles_tweaks.vim | 10 +++-------
 nvim/plugin/interface.vim                            |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/nvim/autoload/airline/extensions/dotfiles_tweaks.vim b/nvim/autoload/airline/extensions/dotfiles_tweaks.vim
index d1822a3..ee76228 100644
--- a/nvim/autoload/airline/extensions/dotfiles_tweaks.vim
+++ b/nvim/autoload/airline/extensions/dotfiles_tweaks.vim
@@ -1,11 +1,7 @@
 function! airline#extensions#dotfiles_tweaks#init(ext) abort
   " Undo this commit a little bit:
   " <https://github.com/vim-airline/vim-airline/commit/8929bc72a13d358bb8369443386ac3cc4796ca16>
-  call airline#parts#define('maxlinenr', {
-  \ 'raw': trim(airline#parts#get('maxlinenr').raw),
-  \ })
-  call airline#parts#define('colnr', {
-  \ 'raw': trim(airline#parts#get('colnr').raw),
-  \ 'accent': 'none',
-  \ })
+  " Most of the hacks present here are not required anymore:
+  " <https://github.com/vim-airline/vim-airline/commit/1f94ec1556db36088897c85db62251b62b683ab3>
+  call airline#parts#define_accent('colnr', 'none')
 endfunction
diff --git a/nvim/plugin/interface.vim b/nvim/plugin/interface.vim
index 975c079..082f3b4 100644
--- a/nvim/plugin/interface.vim
+++ b/nvim/plugin/interface.vim
@@ -92,8 +92,8 @@ endif
   let g:airline_symbols = {
     \ 'readonly': 'RO',
     \ 'whitespace': '',
-    \ 'colnr': '',
-    \ 'linenr': '',
+    \ 'colnr': ' :',
+    \ 'linenr': ' :',
     \ 'maxlinenr': ' ',
     \ 'branch': '',
     \ 'notexists': ' [?]',