Skip to content

Commit 494d5aa

Browse files
committed
fix mac fileformat typo, use \n as search criterion for both dos and unix
1 parent 9e4f387 commit 494d5aa

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

plugin/better-whitespace.vim

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,10 @@ function! s:StripWhitespace(line1, line2)
201201

202202
" Strip empty lines at EOF
203203
if g:strip_whitelines_at_eof >= 1 && a:line2 >= line('$')
204-
if &ff == 'dos'
205-
let nl='\r\n'
206-
elseif &ff == 'max'
207-
let nl='\r'
208-
else " unix
204+
if &ff == 'dos' || &ff == 'unix'
209205
let nl='\n'
206+
elseif &ff == 'mac'
207+
let nl='\r'
210208
endif
211209
silent execute '%s/\('.nl.'\)\+\%$//e'
212210
" Add trailing newline at EOF
@@ -457,3 +455,4 @@ endif
457455
let s:errmsg='please set g:current_line_whitespace_disabled_{soft,hard} and reload better whitespace'
458456
command! -nargs=* CurrentLineWhitespaceOff echoerr 'E492: Deprecated command CurrentLineWhitespaceOff: '.s:errmsg
459457
command! CurrentLineWhitespaceOn echoerr 'E492: Deprecated command CurrentLineWhitespaceOn: '.s:errmsg
458+

0 commit comments

Comments
 (0)