From 28ed36a9ec9c9bc35bec81c42cfbf8cf5e76b231 Mon Sep 17 00:00:00 2001
From: Christian Brabandt <cb@256bit.org>
Date: Fri, 26 Apr 2019 22:08:26 +0200
Subject: [PATCH] whitespace: fix small problems from conflicts test

---
 autoload/airline/extensions/whitespace.vim | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim
index 453f0aaa..e39265b3 100644
--- a/autoload/airline/extensions/whitespace.vim
+++ b/autoload/airline/extensions/whitespace.vim
@@ -51,8 +51,7 @@ function! s:conflict_marker()
   " Checks for git conflict markers
   let annotation = '\%([0-9A-Za-z_.:]\+\)\?'
   let pattern = '^\%(\%(<\{7} '.annotation. '\)\|\%(=\{7\}\)\|\%(>\{7\} '.annotation.'\)\)$'
-  let result = search(pattern, 'nw')
-  return result
+  return search(pattern, 'nw')
 endfunction
 
 function! airline#extensions#whitespace#check()
@@ -128,7 +127,7 @@ function! airline#extensions#whitespace#check()
           let mixed_indent_file_fmt = get(g:, 'airline#extensions#whitespace#mixed_indent_file_format', '[%s]mix-indent-file')
           let b:airline_whitespace_check .= space.printf(mixed_indent_file_fmt, mixed_file)
         endif
-        if !empty(conflicts)
+        if conflicts != 0
           let conflicts_fmt = get(g:, 'airline#extensions#whitespace#conflicts_format', '[%s]conflicts')
           let b:airline_whitespace_check .= space.printf(conflicts_fmt, conflicts)
         endif