aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-05 13:20:24 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-05 13:20:24 +1200
commit0946352681a863a2d2f06008cc3dd63c8f8185c5 (patch)
treef14e7501fdcb2de4723b53e2e8873019c72a243b
parent9d54f2b9d9246d4ad35172745d68d17290eeb840 (diff)
parent2431983ed433719e2746753e5c80472ea2aa90f2 (diff)
downloaddotfiles-0.47.0.tar.gz (sig)
dotfiles-0.47.0.zip
Merge branch 'release/v0.47.0'v0.47.0
* release/v0.47.0: Bump VERSION Spin off markdown_autoformat as its own distro Merge bundle install into one command Restore ftplugin extras to vim/after dir Add ftplugin infrastructure and comments Add global options for markdown_autoformat.vim Use += shorthand in Vim ftplugin Pass in mapped key directly, not a flag
-rw-r--r--.gitmodules3
-rw-r--r--Makefile13
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/markdown/spell.vim (renamed from vim/ftplugin/markdown/spell.vim)0
-rw-r--r--vim/after/ftplugin/php/check.vim (renamed from vim/ftplugin/php/check.vim)0
m---------vim/bundle/markdown_autoformat0
-rw-r--r--vim/ftplugin/markdown/autoformat.vim96
7 files changed, 9 insertions, 107 deletions
diff --git a/.gitmodules b/.gitmodules
index 9bda87e8..212a4e52 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,6 +17,9 @@
[submodule "vim/bundle/mail_mutt"]
path = vim/bundle/mail_mutt
url = https://sanctum.geek.nz/code/vim-mail-mutt.git
+[submodule "vim/bundle/markdown_autoformat"]
+ path = vim/bundle/markdown_autoformat
+ url = https://sanctum.geek.nz/code/vim-markdown-autoformat.git
[submodule "vim/bundle/put_blank_lines"]
path = vim/bundle/put_blank_lines
url = https://sanctum.geek.nz/code/vim-put-blank-lines.git
diff --git a/Makefile b/Makefile
index 134935ae..93d12a0b 100644
--- a/Makefile
+++ b/Makefile
@@ -525,8 +525,8 @@ install-vim-after-syntax:
install-vim-bundle: install-vim-config
find vim/bundle/*/* \
-type d -exec sh -c \
- 'mkdir -p -- $(VIMDIR)/"$${1#vim/bundle/*/}"' _ {} \;
- find vim/bundle/*/*/* \
+ 'mkdir -p -- $(VIMDIR)/"$${1#vim/bundle/*/}"' _ {} \; \
+ -o \
-type f -exec sh -c \
'cp -p -- "$$1" $(VIMDIR)/"$${1#vim/bundle/*/}"' _ {} \;
vim -eT dumb -c 'helptags $(VIMDIR)/doc' -c quit
@@ -546,13 +546,8 @@ install-vim-ftdetect:
cp -p -- vim/ftdetect/*.vim $(VIMDIR)/ftdetect
install-vim-ftplugin:
- mkdir -p $(VIMDIR)/ftplugin
- find vim/ftplugin \
- -type d -exec sh -c \
- 'mkdir -p -- $(VIMDIR)/"$${1#vim/}"' _ {} \; \
- -o \
- -type f -exec sh -c \
- 'cp -p -- "$$1" $(VIMDIR)/"$${1#vim/}"' _ {} \;
+ mkdir -p -- $(VIMDIR)/indent
+ cp -p -- vim/indent/*.vim $(VIMDIR)/indent
install-vim-indent:
mkdir -p -- $(VIMDIR)/indent
diff --git a/VERSION b/VERSION
index 15dfadf5..74f9bf2e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.46.0
-Mon Jun 4 10:44:39 UTC 2018
+tejr dotfiles v0.47.0
+Tue Jun 5 01:19:50 UTC 2018
diff --git a/vim/ftplugin/markdown/spell.vim b/vim/after/ftplugin/markdown/spell.vim
index 05fc7c00..05fc7c00 100644
--- a/vim/ftplugin/markdown/spell.vim
+++ b/vim/after/ftplugin/markdown/spell.vim
diff --git a/vim/ftplugin/php/check.vim b/vim/after/ftplugin/php/check.vim
index 33077a72..33077a72 100644
--- a/vim/ftplugin/php/check.vim
+++ b/vim/after/ftplugin/php/check.vim
diff --git a/vim/bundle/markdown_autoformat b/vim/bundle/markdown_autoformat
new file mode 160000
+Subproject 0b403358bc35c4a1303b2a4e7ca8c536b13222f
diff --git a/vim/ftplugin/markdown/autoformat.vim b/vim/ftplugin/markdown/autoformat.vim
deleted file mode 100644
index 80bd034c..00000000
--- a/vim/ftplugin/markdown/autoformat.vim
+++ /dev/null
@@ -1,96 +0,0 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled, or if no autocmd feature, or if Vim
-" is too old to support the needed autocmd events
-if exists('b:did_ftplugin_markdown_autoformat') || &compatible
- finish
-endif
-if !has('autocmd') || v:version < 700
- finish
-endif
-let b:did_ftplugin_markdown_autoformat = 1
-if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_markdown_autoformat'
-endif
-
-" Turn on autoformatting if less than 5% of the buffer's lines meet all three
-" of these conditions:
-" * Longer than 'textwidth'
-" * Contains at least one space (not an unsplittable line)
-" * Not a code block (indented with at least four spaces)
-if !exists('*s:Load')
- function! s:Load() abort
- let l:width = &textwidth ? &textwidth : 79
- let l:count = 0
- let l:total = line('$')
- for l:li in range(1, l:total)
- let l:line = getline(l:li)
- if strlen(l:line) > l:width
- \ && stridx(l:line, ' ') > -1
- \ && l:line !~# '\m^ '
- let l:count = l:count + 1
- endif
- endfor
- if l:count * 100 / l:total < 5
- setlocal formatoptions+=a
- else
- setlocal formatoptions-=a
- endif
- endfunction
-endif
-call s:Load()
-
-" Suspend auto-formatting when in a code block (four-space indent)
-if !exists('*s:Line')
- function! s:Line() abort
- if getline('.') =~# '\m^ '
- if &formatoptions =~# '\ma'
- setlocal formatoptions-=a
- let b:markdown_autoformat_suspended = 1
- endif
- elseif exists('b:markdown_autoformat_suspended')
- setlocal formatoptions+=a
- unlet b:markdown_autoformat_suspended
- endif
- endfunction
-endif
-augroup ftplugin_markdown_autoformat
- autocmd!
- autocmd BufWinEnter,CursorMoved,CursorMovedI,WinEnter
- \ <buffer>
- \ call s:Line()
-augroup END
-
-" Suspend auto-format when pasting anything with a linebreak
-if !exists('*s:Put')
- function! s:Put(above) abort
- let l:suspended = 0
- if &formatoptions =~# '\ma' && getreg() =~# '\m\n'
- setlocal formatoptions-=a
- let l:suspended = 1
- endif
- if a:above
- execute 'normal! "'.v:register.v:count1.'P'
- else
- execute 'normal! "'.v:register.v:count1.'p'
- endif
- if l:suspended
- setlocal formatoptions+=a
- endif
- endfunction
-endif
-nnoremap <buffer> <silent>
- \ p
- \ :<C-u>call <SID>Put(0)<CR>
-nnoremap <buffer> <silent>
- \ P
- \ :<C-u>call <SID>Put(1)<CR>
-
-" Undo all the above
-if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|setlocal formatoptions<'
- \ . '|augroup ftplugin_markdown_autoformat'
- \ . '|autocmd! * <buffer>'
- \ . '|augroup END'
-endif