init: use a minimum of 2 columns for the current line number

fixes: #2699

Signed-off-by: Christian Brabandt <cb@256bit.org>

autoload/airline/extensions/nvimlsp.vim

@@ -47,7 +47,7 @@ endfunction
 
 function! s:airline_nvimlsp_get_line_number(cnt, type) abort
   let severity = a:type == 'Warning' ? 'Warn' : a:type
-  let num = v:lua.vim.diagnostic.get(0, { 'severity': severity })[0].lnum
+  let num = v:lua.vim.diagnostic.get(0, { 'severity': severity })[0].lnum + 1
 
   let l:open_lnum_symbol  =
     \ get(g:, 'airline#extensions#nvimlsp#open_lnum_symbol', '(L')

autoload/airline/init.vim

@@ -138,6 +138,11 @@ function! airline#init#bootstrap()
           \ 'crypt': nr2char(0x1F512),
           \ }, 'keep')
     "  Note: If "\u2046" (Ɇ) does not show up, try to use "\u2204" (∄)
+    if exists("*setcellwidths")
+      " whitespace char 0x2632 changed to double-width in Unicode 16,
+      " mark it single width again
+      call setcellwidths([[0x2632, 0x2632, 1]])
+    endif
   elseif &encoding==?'utf-8' && !get(g:, "airline_symbols_ascii", 0)
     " Symbols for Unicode terminals
     call s:check_defined('g:airline_left_sep', "")
@@ -195,7 +200,7 @@ function! airline#init#bootstrap()
   endif
   call airline#parts#define_raw('path', '%F%m')
   call airline#parts#define('linenr', {
-        \ 'raw': '%{g:airline_symbols.linenr}%l',
+        \ 'raw': '%{g:airline_symbols.linenr}%2l',
         \ 'accent': 'bold'})
   call airline#parts#define('maxlinenr', {
         \ 'raw': '/%L%{g:airline_symbols.maxlinenr}',