From 42e710eacb996cb054ffba020133c1132d47889a Mon Sep 17 00:00:00 2001 From: Noah Frederick Date: Tue, 16 Feb 2016 17:58:21 -0500 Subject: man.vim: clean up regex/string comparisons - Explicitly specify case sensitivity when comparing strings - Clean up unnecessarily complex `if` statements --- runtime/autoload/man.vim | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index f702c39826..f0e9af01a2 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -51,7 +51,7 @@ function man#get_page(...) abort if winnr() > 1 exe "norm! " . thiswin . "\w" while 1 - if &filetype == 'man' + if &filetype ==# 'man' break endif wincmd w @@ -75,10 +75,10 @@ function man#get_page(...) abort endif silent exec 'r!/usr/bin/man '.s:cmd(sect, page).' | col -b' " Remove blank lines from top and bottom. - while getline(1) =~ '^\s*$' + while getline(1) =~# '^\s*$' silent keepjumps norm! gg"_dd endwhile - while getline('$') =~ '^\s*$' + while getline('$') =~# '^\s*$' silent keepjumps norm! G"_dd endwhile setlocal nomodified @@ -133,10 +133,5 @@ endfunction function s:find_page(sect, page) abort let where = system('/usr/bin/man '.s:man_find_arg.' '.s:cmd(a:sect, a:page)) - if where !~ "^/" - if matchstr(where, " [^ ]*$") !~ "^ /" - return 0 - endif - endif - return 1 + return (where =~# '^ */') endfunction -- cgit