# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1533149646 0
# Node ID 44bf69c2ddfc5d0cf5f534f2d23578432152c4fb
# Parent  b8fcc95eea5282bdeece0183415b15f3f1f974a6# Parent  c1a1eef2ea4e639e77ead654b0c74007d38b4300
Merge.

diff -r b8fcc95eea52 -r 44bf69c2ddfc bin/eq
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/eq	Wed Aug 01 18:54:06 2018 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# if you don't have the script's cwd set, you get XML errors
+export WINEPREFIX=$HOME/.wine/
+
+cd ~/.wine/drive_c/Program\ Files/Sony/EverQuest
+
+# Bind to one core of the processor and launch.
+# The client will spew a lot of errors, especially every time
+# you target a mob, hence the stdout/stderr redirect.
+# You probably want to leave off the 2>/dev/null until you're satisfied
+# everything is working.
+# taskset -c 0 padsp wine eqgame.exe patchme 2>/dev/null
+taskset -c 0 padsp wine eqgame.exe patchme
diff -r b8fcc95eea52 -r 44bf69c2ddfc vim/bundle/redact-pass/doc/redact_pass.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/redact-pass/doc/redact_pass.txt	Wed Aug 01 18:54:06 2018 +0000
@@ -0,0 +1,1 @@
+/home/sjl/src/password-store/contrib/vim/redact_pass.txt
\ No newline at end of file
diff -r b8fcc95eea52 -r 44bf69c2ddfc vim/bundle/redact-pass/plugin/redact_pass.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/redact-pass/plugin/redact_pass.vim	Wed Aug 01 18:54:06 2018 +0000
@@ -0,0 +1,1 @@
+/home/sjl/src/password-store/contrib/vim/redact_pass.vim
\ No newline at end of file
diff -r b8fcc95eea52 -r 44bf69c2ddfc vim/vimrc
--- a/vim/vimrc	Wed Aug 01 18:53:57 2018 +0000
+++ b/vim/vimrc	Wed Aug 01 18:54:06 2018 +0000
@@ -2268,57 +2268,6 @@
 endfunction
 
 " }}}
-" Pass {{{
-
-" https://github.com/milki/password-store/blob/master/contrib/vim/noplaintext.vim
-"
-" Prevent various Vim features from keeping the contents of pass(1) password
-" files (or any other purely temporary files) in plaintext on the system.
-"
-" Either append this to the end of your .vimrc, or install it as a plugin with
-" a plugin manager like Tim Pope's Pathogen.
-"
-" Author: Tom Ryder <tom@sanctum.geek.nz>
-"
-
-" Don't backup files in temp directories or shm
-if exists('&backupskip')
-    set backupskip+=/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/*
-endif
-
-" Don't keep swap files in temp directories or shm
-if has('autocmd')
-    augroup swapskip
-        autocmd!
-        silent! autocmd BufNewFile,BufReadPre
-            \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/*
-            \ setlocal noswapfile
-    augroup END
-endif
-
-" Don't keep undo files in temp directories or shm
-if has('persistent_undo') && has('autocmd')
-    augroup undoskip
-        autocmd!
-        silent! autocmd BufWritePre
-            \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/*
-            \ setlocal noundofile
-    augroup END
-endif
-
-" Don't keep viminfo for files in temp directories or shm
-if has('viminfo')
-    if has('autocmd')
-        augroup viminfoskip
-            autocmd!
-            silent! autocmd BufNewFile,BufReadPre
-                \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/*
-                \ setlocal viminfo=
-        augroup END
-    endif
-endif
-
-" }}}
 " Python-Mode {{{
 
 let g:pymode_doc = 1