From 4f8c7d55b516543da97649aba6507b7c595767a4 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 30 Mar 2018 17:26:55 -0400
Subject: Set g:clipboard to pb{copy,paste} always

Previously neovim would use these automatically if it found them, but
now it only checks for them on macOS. pbd continues to work well.
---
 home/.config/nvim/init.vim | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim
index 04a9d56b..e58b6996 100644
--- a/home/.config/nvim/init.vim
+++ b/home/.config/nvim/init.vim
@@ -7,7 +7,8 @@ command! W w
 command! Q q
 autocmd BufNewFile,BufRead *.asm,*.mac setfiletype nasm
 
-set tabstop=8 expandtab shiftwidth=4 shiftround smartindent cinoptions=l1(sU1m1
+set tabstop=8 expandtab shiftwidth=4 shiftround
+set smartindent cinoptions=l1(sU1m1
 set ignorecase smartcase inccommand=nosplit
 nmap <leader><leader> :nohlsearch<CR>
 set foldmethod=syntax foldlevel=99
@@ -22,6 +23,8 @@ autocmd TermOpen * setlocal nonumber statusline=%{b:term_title}
 autocmd BufEnter term://* startinsert
 tmap <C-w> <C-\><C-n><C-w>
 
+let g:clipboard = {'copy':{'+':'pbcopy'},'paste':{'+':'pbpaste'}}
+
 nmap <leader>h :0/^#include </,$?^#include <?sort<CR>:nohlsearch<CR>
 nmap <leader>u :0/^use/,$?^use?sort<CR>:nohlsearch<CR>
 nmap <leader>c :0/extern crate/,$?extern crate?sort<CR>:nohlsearch<CR>
-- 
cgit 1.4.1

1'>commit</a> <a href='/dash/diff/src/cd.h?id=dad1cb18b60ecce925f4ed234553a43fa6c81447&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/dash/log/src/cd.h'>
<input type='hidden' name='id' value='dad1cb18b60ecce925f4ed234553a43fa6c81447'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/dash/log/?id=dad1cb18b60ecce925f4ed234553a43fa6c81447&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/dash/log/src?id=dad1cb18b60ecce925f4ed234553a43fa6c81447&amp;showmsg=1&amp;follow=1'>src</a>/<a href='/dash/log/src/cd.h?id=dad1cb18b60ecce925f4ed234553a43fa6c81447&amp;showmsg=1&amp;follow=1'>cd.h</a> (<a href='/dash/log/src/cd.h?id=dad1cb18b60ecce925f4ed234553a43fa6c81447&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/dash/log/src/cd.h?id=dad1cb18b60ecce925f4ed234553a43fa6c81447&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2018-04-02 23:30:44 +0800'>2018-04-02</span></td><td class='logsubject'><a href='/dash/commit/src/expand.c?id=f88078247635fd076c935af6413f75395d5159da&amp;follow=1'>expand: Fix bugs with words connected to the right of $@</a></td><td>Herbert Xu</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
On Sun, Mar 04, 2018 at 12:44:59PM +0100, Harald van Dijk wrote:
&gt;
&gt; command:      set -- a ""; space=" "; printf "&lt;%s&gt;" "$@"$space
&gt; bash:         &lt;a&gt;&lt;&gt;
&gt; dash 0.5.8:   &lt;a&gt;&lt; &gt;
&gt; dash 0.5.9.1: &lt;a&gt;&lt; &gt;
&gt; dash patched: &lt;a&gt;&lt;&gt;

This is actually composed of two bugs.  First of all our tracking
of quotemark is wrong so anything after "$@" becomes quoted.  Once
we fix that then the problem is that the first space character
after "$@" is not recognised as an IFS.

This patch fixes both.

Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;


</td></tr>
<tr class='logheader'><td><span title='2018-03-25 10:33:38 +0800'>2018-03-25</span></td><td class='logsubject'><a href='/dash/commit/src/bltin/printf.c?id=fcb3864e0e348c206c12b3dae9e734d1efa2029e&amp;follow=1'>Revert "[BUILTIN] Remove unnecessary restoration of format string in printf"</a></td><td>Herbert Xu</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This reverts commit 7bb413255368e94395237d789f522891093c5774.

The commit breaks printf with more than argument.

Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;


</td></tr>
<tr class='logheader'><td><span title='2018-03-22 00:29:58 +0800'>2018-03-22</span></td><td class='logsubject'><a href='/dash/commit/src/parser.c?id=c166b718b496da63c4df7a0972df2fc6cd38256b&amp;follow=1'>parser: Fix backquote support in here-document EOF mark</a></td><td>Herbert Xu