324d9b638b9a
Merge
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Mon, 31 Aug 2020 11:53:46 -0400 |
| parents | 613dc4aa9f25 (diff) dd879591c545 (current diff) |
| children | 31e094924f7e |
| branches/tags | (none) |
| files | vim/custom-dictionary.utf-8.add vim/vimrc |
Changes
--- a/bin/doc Sun Aug 30 21:13:42 2020 -0400 +++ b/bin/doc Mon Aug 31 11:53:46 2020 -0400 @@ -5,7 +5,7 @@ LANG=$1 shift -if test "$LANG" -eq "go"; then +if test "$LANG" = "go"; then LANG=golang fi
--- a/fish/functions/ep.fish Sun Aug 30 21:13:42 2020 -0400 +++ b/fish/functions/ep.fish Mon Aug 31 11:53:46 2020 -0400 @@ -6,7 +6,6 @@ make cat README.markdown | sed -En 'H; /^## [0-9]{4}-[0-9]{2}-[0-9]{2}/h; ${g;p;}' | tail +3 > ~/.plan git cm 'Update' -a - git push origin master case '*' hg pull -u nvim README.markdown
--- a/vim/custom-dictionary.utf-8.add Sun Aug 30 21:13:42 2020 -0400 +++ b/vim/custom-dictionary.utf-8.add Mon Aug 31 11:53:46 2020 -0400 @@ -309,4 +309,5 @@ deduplicating passlist golang +lifecycle unapplied
--- a/vim/vimrc Sun Aug 30 21:13:42 2020 -0400 +++ b/vim/vimrc Mon Aug 31 11:53:46 2020 -0400 @@ -1504,6 +1504,8 @@ au FileType go iabbrev <buffer> erstr if err != nil {<cr>return "", err<esc>jA au FileType go iabbrev <buffer> ererr if err != nil {<cr>return err<esc>jA au FileType go iabbrev <buffer> erpan if err != nil {<cr>panic(err)<esc>jA + + au FileType gohtmltmpl setlocal shiftwidth=4 augroup END " }}}