# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1604590387 18000
# Node ID a025b0d30da44a796a6bd69a9441c4a9eb154cc4
# Parent  785a46b1b198676427f58a340480fe6447caf658# Parent  52daeac2d624a77a86d1067df83e82f9a4e09bb4
Merge

diff -r 52daeac2d624 -r a025b0d30da4 vim/vimrc
--- a/vim/vimrc	Wed Oct 21 23:33:40 2020 -0400
+++ b/vim/vimrc	Thu Nov 05 10:33:07 2020 -0500
@@ -1500,10 +1500,9 @@
     au FileType go inoremap <c-n> <c-x><c-o>
 
     " this language is incredible
-    au FileType go iabbrev <buffer> ernil if err != nil {<cr>return nil, err<esc>jA
-    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 go iabbrev <buffer> enil if err != nil
+    au FileType go iabbrev <buffer> rete return err
+    au FileType go iabbrev <buffer> retne return nil, err
 
     au FileType gohtmltmpl setlocal shiftwidth=4
 augroup END
@@ -1805,7 +1804,7 @@
     au FileType pgsql nnoremap <buffer> <silent> <localleader>e :call NeoReplSendParagraph()<cr>
     au FileType pgsql nnoremap <buffer> <silent> <localleader>f :call NeoReplSendEntireFile()<cr>
     au FileType pgsql nnoremap <buffer> <silent> <localleader>c :call NeoReplSendRaw("")<cr>
-
+    au FileType pgsql nnoremap <buffer> <silent> <localleader>q :call NeoReplSendRaw("q")<cr>
 augroup END
 
 " }}}