# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1577374766 18000
# Node ID dbdc482505c1281b595df5ef95c6ab4e3de2d12e
# Parent  57f3131c232a2ecdda1d299816e005360ee60a46# Parent  7c8e9659a1c591e3ea75292a9753d0d04c995aa8
Merge.

diff -r 57f3131c232a -r dbdc482505c1 fish/config.fish
diff -r 57f3131c232a -r dbdc482505c1 lisp/retry.lisp
diff -r 57f3131c232a -r dbdc482505c1 lispwords
--- a/lispwords	Thu Dec 26 10:39:00 2019 -0500
+++ b/lispwords	Thu Dec 26 10:39:26 2019 -0500
@@ -123,15 +123,18 @@
 ; adopt
 (2 define-interface)
 (1 make-option)
+(1 quit-on-ctrl-c)
 
 ; boots
 (1 make-widget)
 
+; metabang-bind
+(1 bind)
+
 ; makerlisp
 (1 if-lets)
 (1 lets)
 (1 macro)
-(2 bind)
 (1 dovec)
 (1 dolist)
 
diff -r 57f3131c232a -r dbdc482505c1 vim/vimrc
--- a/vim/vimrc	Thu Dec 26 10:39:00 2019 -0500
+++ b/vim/vimrc	Thu Dec 26 10:39:26 2019 -0500
@@ -2624,13 +2624,14 @@
 " }}}
 " Vlime {{{
 
+
 let g:vlime_window_settings = {
         \ "sldb": {
             \ "pos": "belowright",
             \ "vertical": v:false
         \ },
         \ "xref": {
-            \ "pos": "belowright",
+            \ "pos": "float",
             \ "size": 5,
             \ "vertical": v:false
         \ },
@@ -2908,12 +2909,12 @@
 "
 " \h<space> - raw hg commands
 
-nnoremap <leader>hc :Start hg commit<cr> 
-
-nnoremap <leader>hpd :Start! hg push default<cr>
-nnoremap <leader>hpu :Start! hg push upstream<cr>
-nnoremap <leader>hpg :Start! hg push git<cr>
-nnoremap <leader>hpp :Start! hg paths -q \| xargs -n1 hg push<cr>
+nnoremap <leader>hc :Start hg commit<cr>
+
+nnoremap <leader>hpd :!hg push default<cr>
+nnoremap <leader>hpu :!hg push upstream<cr>
+nnoremap <leader>hpg :!hg push git<cr>
+nnoremap <leader>hpa :!hg paths -q \| xargs -n1 hg push<cr>
 
 function! s:HgDiff() " {{{
     diffthis
diff -r 57f3131c232a -r dbdc482505c1 weechat/.agignore
--- a/weechat/.agignore	Thu Dec 26 10:39:00 2019 -0500
+++ b/weechat/.agignore	Thu Dec 26 10:39:26 2019 -0500
@@ -1,2 +1,2 @@
-logs
+logs/
 urls.log