aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-21 00:11:18 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-21 00:11:18 +1200
commit9974fda1136b394e2dab341e96e37cb2d8dc8aaa (patch)
treee7ceebeab53f08e1de2b9177f06f052de6d2c731
parent51d00a34c1d094bd9c94b065b08f2aa22e1ad8a1 (diff)
parenta9624ebc9e13596011d57c17f8339b358b640d1f (diff)
downloaddotfiles-4.35.0.tar.gz
Merge branch 'release/v4.35.0'v4.35.0
* release/v4.35.0: Bump VERSION Move shebang change filetype hooks into plugin
-rw-r--r--.gitmodules3
-rw-r--r--VERSION4
-rw-r--r--vim/autoload/filetype.vim8
m---------vim/bundle/shebang_change_filetype0
-rw-r--r--vim/filetype.vim6
5 files changed, 5 insertions, 16 deletions
diff --git a/.gitmodules b/.gitmodules
index 350261c6..c6bc6a4a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -53,6 +53,9 @@
[submodule "vim/bundle/scroll_next"]
path = vim/bundle/scroll_next
url = https://sanctum.geek.nz/code/vim-scroll-next.git
+[submodule "vim/bundle/shebang_change_filetype"]
+ path = vim/bundle/shebang_change_filetype
+ url = https://sanctum.geek.nz/code/vim-shebang-change-filetype.git
[submodule "vim/bundle/shebang_create_exec"]
path = vim/bundle/shebang_create_exec
url = https://sanctum.geek.nz/code/vim-shebang-create-exec.git
diff --git a/VERSION b/VERSION
index c20057e0..a180255d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.34.0
-Mon May 20 05:01:08 UTC 2019
+tejr dotfiles v4.35.0
+Mon May 20 12:11:18 UTC 2019
diff --git a/vim/autoload/filetype.vim b/vim/autoload/filetype.vim
index fb70d690..79df3b28 100644
--- a/vim/autoload/filetype.vim
+++ b/vim/autoload/filetype.vim
@@ -64,11 +64,3 @@ function! filetype#SudoRepeat() abort
endif
endfunction
-
-" Check whether the first line was changed and looks like a shebang, and if
-" so, re-run filetype detection
-function! filetype#CheckShebang() abort
- if line('''[') == 1 && getline(1) =~# '^#!'
- doautocmd filetypedetect BufRead
- endif
-endfunction
diff --git a/vim/bundle/shebang_change_filetype b/vim/bundle/shebang_change_filetype
new file mode 160000
+Subproject 961e50bfc2128e04c7771ee0150d9024f561698
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 9d6c6eb7..c5f67db0 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -513,10 +513,4 @@ augroup filetypedetect
\| runtime scripts.vim
\|endif
- " On leaving insert mode, check whether the first line was changed and looks
- " like a shebang format, and if so, re-run filetype detection
- autocmd InsertLeave
- \ *
- \ call filetype#CheckShebang()
-
augroup END