# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1598889226 14400
# Node ID 324d9b638b9a5a307e1e4747befbc284121e14e9
# Parent  613dc4aa9f255b7aa00cad0be07e4176e9dc0516# Parent  dd879591c5452a34e55f6a2ba41fef0617776ad9
Merge

diff -r dd879591c545 -r 324d9b638b9a bin/doc
--- 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
 
diff -r dd879591c545 -r 324d9b638b9a fish/functions/ep.fish
--- 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
diff -r dd879591c545 -r 324d9b638b9a vim/custom-dictionary.utf-8.add
--- 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
diff -r dd879591c545 -r 324d9b638b9a vim/vimrc
--- 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
 
 " }}}