Skip to content

Commit

Permalink
Merge remote-tracking branch 'rcaputo/master'
Browse files Browse the repository at this point in the history
Fixes #64. Closes #72.

Merged manually rather than through Github to fix merge conflict.
  • Loading branch information
alerque committed Jul 1, 2019
2 parents fa7fbd2 + 298d532 commit 95f7fbf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ftdetect/ledger.vim
Original file line number Diff line number Diff line change
@@ -1 +1 @@
autocmd BufEnter,BufRead *.ldg,*.ledger,*.journal setlocal filetype=ledger | compiler ledger
autocmd BufNewFile,BufRead *.ldg,*.ledger,*.journal setlocal filetype=ledger
6 changes: 5 additions & 1 deletion ftplugin/ledger.vim
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ let b:undo_ftplugin = "setlocal ".
\ "foldtext< ".
\ "include< comments< commentstring< omnifunc< formatprg<"

if !exists('current_compiler')
compiler ledger
endif

setl foldtext=LedgerFoldText()
setl include=^!\\?include
setl comments=b:;
Expand Down Expand Up @@ -179,7 +183,7 @@ let s:rx_amount = '\('.
function! LedgerFoldText() "{{{1
" find amount
let amount = ""
let lnum = v:foldstart
let lnum = v:foldstart + 1
while lnum <= v:foldend
let line = getline(lnum)

Expand Down

0 comments on commit 95f7fbf

Please sign in to comment.