Skip to content

Commit

Permalink
Rename s:warn to s:error and set v:errmsg.
Browse files Browse the repository at this point in the history
  • Loading branch information
moll committed Mar 3, 2018
1 parent 045d6e4 commit 1b106f2
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions plugin/bbye.vim
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ function! s:bdelete(action, bang, buffer_name)
let w:bbye_back = 1

if buffer < 0
return s:warn("E516: No buffers were deleted. No match for ".a:buffer_name)
return s:error("E516: No buffers were deleted. No match for ".a:buffer_name)
endif

if getbufvar(buffer, "&modified") && empty(a:bang)
let error = "E89: No write since last change for buffer "
return s:warn(error . buffer . " (add ! to override)")
return s:error(error . buffer . " (add ! to override)")
endif

" If the buffer is set to delete and it contains changes, we can't switch
Expand Down Expand Up @@ -53,7 +53,7 @@ endfunction
function! s:str2bufnr(buffer)
if empty(a:buffer)
return bufnr("%")
elseif a:buffer =~ '^\d\+$'
elseif a:buffer =~# '^\d\+$'
return bufnr(str2nr(a:buffer))
else
return bufnr(a:buffer)
Expand All @@ -74,10 +74,11 @@ function! s:new(bang)
endfunction

" Using the built-in :echoerr prints a stacktrace, which isn't that nice.
function! s:warn(msg)
function! s:error(msg)
echohl ErrorMsg
echomsg a:msg
echohl NONE
let v:errmsg = a:msg
endfunction

command! -bang -complete=buffer -nargs=? Bdelete
Expand Down

0 comments on commit 1b106f2

Please sign in to comment.