diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2019-07-23 01:15:52 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-07-23 01:15:52 +1200 |
| commit | 2e11ee5f2657f92c74f668c4cc49610f8a058c6d (patch) | |
| tree | 49c1cda5e4507547931d573b3c1f767f74ca3f4f | |
| parent | Merge branch 'release/v7.0.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-2e11ee5f2657f92c74f668c4cc49610f8a058c6d.tar.gz dotfiles-2e11ee5f2657f92c74f668c4cc49610f8a058c6d.zip | |
Merge branch 'release/v7.1.0'v7.1.0
* release/v7.1.0:
Spin alternate_filetypes.vim plugin into a dist
Add a Git hooks issue with new repositories
Set font for Vim 2html.vim
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | ISSUES.md | 6 | ||||
| -rw-r--r-- | VERSION | 4 | ||||
| -rw-r--r-- | vim/autoload/alternate_filetypes.vim | 13 | ||||
| m--------- | vim/bundle/alternate_filetypes | 0 | ||||
| -rw-r--r-- | vim/plugin/2html.vim | 1 | ||||
| -rw-r--r-- | vim/plugin/alternate_filetypes.vim | 4 |
7 files changed, 12 insertions, 19 deletions
diff --git a/.gitmodules b/.gitmodules index f91504da..b15ef0dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,7 @@ # Vim plugins +[submodule "vim/bundle/alternate_filetypes"] + path = vim/bundle/alternate_filetypes + url = https://sanctum.geek.nz/code/vim-alternate-filetypes.git [submodule "vim/bundle/big_file_options"] path = vim/bundle/big_file_options url = https://sanctum.geek.nz/code/vim-big-file-options.git @@ -30,3 +30,9 @@ Known issues pushed upstream. * The `_text_filenames` completion handler for Bash won't work on files with newlines in their names. Can it be made to? +* First commit to a new repository fails with the Git template hooks because + the HEAD ref doesn't exist yet: + + fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree. + Use '--' to separate paths from revisions, like this: + 'git <command> [<revision>...] -- [<file>...]' @@ -1,2 +1,2 @@ -tejr dotfiles v7.0.0 -Thu, 18 Jul 2019 02:27:14 +0000 +tejr dotfiles v7.1.0 +Mon, 22 Jul 2019 13:15:50 +0000 diff --git a/vim/autoload/alternate_filetypes.vim b/vim/autoload/alternate_filetypes.vim deleted file mode 100644 index 08ac88dc..00000000 --- a/vim/autoload/alternate_filetypes.vim +++ /dev/null @@ -1,13 +0,0 @@ -function! alternate_filetypes#() abort - if exists('b:alternate_filetypes') - let filetypes = b:alternate_filetypes - let index = index(filetypes, &filetype) - if index >= 0 - let &filetype = filetypes[ - \ (index + 1) % len(filetypes) - \] - else - unlet b:alternate_filetypes - endif - endif -endfunction diff --git a/vim/bundle/alternate_filetypes b/vim/bundle/alternate_filetypes new file mode 160000 +Subproject 8110b88643276c17079e597a61ca3c3736b36fd diff --git a/vim/plugin/2html.vim b/vim/plugin/2html.vim new file mode 100644 index 00000000..95dcbb6c --- /dev/null +++ b/vim/plugin/2html.vim @@ -0,0 +1 @@ +let g:html_font = ['DejaVu Sans Mono', 'Ubuntu Mono', 'Consolas'] diff --git a/vim/plugin/alternate_filetypes.vim b/vim/plugin/alternate_filetypes.vim deleted file mode 100644 index e024c9b2..00000000 --- a/vim/plugin/alternate_filetypes.vim +++ /dev/null @@ -1,4 +0,0 @@ -command -bar AlternateFileType - \ call alternate_filetypes#() | set filetype? -nnoremap <silent> <Plug>(AlternateFileType) - \ :<C-U>AlternateFileType<CR> |