aboutsummaryrefslogtreecommitdiff
path: root/vim/after
diff options
context:
space:
mode:
Diffstat (limited to 'vim/after')
-rw-r--r--vim/after/ftplugin/awk.vim5
-rw-r--r--vim/after/ftplugin/c.vim5
-rw-r--r--vim/after/ftplugin/cpp.vim5
-rw-r--r--vim/after/ftplugin/diff.vim5
-rw-r--r--vim/after/ftplugin/gitcommit.vim5
-rw-r--r--vim/after/ftplugin/html.vim17
-rw-r--r--vim/after/ftplugin/mail.vim5
-rw-r--r--vim/after/ftplugin/make.vim5
-rw-r--r--vim/after/ftplugin/markdown.vim5
-rw-r--r--vim/after/ftplugin/perl.vim5
-rw-r--r--vim/after/ftplugin/php.vim5
-rw-r--r--vim/after/ftplugin/sed.vim5
-rw-r--r--vim/after/ftplugin/sh.vim5
-rw-r--r--vim/after/ftplugin/text.vim5
-rw-r--r--vim/after/ftplugin/vim.vim33
-rw-r--r--vim/after/ftplugin/zsh.vim5
16 files changed, 89 insertions, 31 deletions
diff --git a/vim/after/ftplugin/awk.vim b/vim/after/ftplugin/awk.vim
index 2051bd21..fae66c3c 100644
--- a/vim/after/ftplugin/awk.vim
+++ b/vim/after/ftplugin/awk.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'awk' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'awk'
diff --git a/vim/after/ftplugin/c.vim b/vim/after/ftplugin/c.vim
index 8ddea387..d98aa130 100644
--- a/vim/after/ftplugin/c.vim
+++ b/vim/after/ftplugin/c.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'c' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'c'
diff --git a/vim/after/ftplugin/cpp.vim b/vim/after/ftplugin/cpp.vim
index 1c834200..acecf3e5 100644
--- a/vim/after/ftplugin/cpp.vim
+++ b/vim/after/ftplugin/cpp.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'cpp' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'cpp'
diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim
index a6d45afe..6098ce48 100644
--- a/vim/after/ftplugin/diff.vim
+++ b/vim/after/ftplugin/diff.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'diff' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'diff'
diff --git a/vim/after/ftplugin/gitcommit.vim b/vim/after/ftplugin/gitcommit.vim
index b53854be..761ebc81 100644
--- a/vim/after/ftplugin/gitcommit.vim
+++ b/vim/after/ftplugin/gitcommit.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'gitcommit' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'gitcommit'
diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim
index a8e9efcc..8a1c22d4 100644
--- a/vim/after/ftplugin/html.vim
+++ b/vim/after/ftplugin/html.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'html' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'html'
@@ -9,6 +12,18 @@ let b:did_ftplugin_after = 1
let b:undo_ftplugin = b:undo_ftplugin
\ . '|unlet b:did_ftplugin_after'
+" Set up hooks for timestamp updating
+augroup html_timestamp
+ autocmd!
+ autocmd BufWritePre *.html
+ \ if exists('b:html_timestamp_check')
+ \| call html#TimestampUpdate()
+ \|endif
+augroup END
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|augroup html_timestamp|autocmd!|augroup END'
+ \ . '|augroup! html_timestamp'
+
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_html_maps')
finish
diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index a25d55b7..68e9e17a 100644
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'mail' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'mail'
diff --git a/vim/after/ftplugin/make.vim b/vim/after/ftplugin/make.vim
index ca4e41a6..30db753f 100644
--- a/vim/after/ftplugin/make.vim
+++ b/vim/after/ftplugin/make.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'make' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'make'
diff --git a/vim/after/ftplugin/markdown.vim b/vim/after/ftplugin/markdown.vim
index 454e5c4c..29d13c71 100644
--- a/vim/after/ftplugin/markdown.vim
+++ b/vim/after/ftplugin/markdown.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'markdown' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'markdown'
diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim
index b007af64..e9747aa3 100644
--- a/vim/after/ftplugin/perl.vim
+++ b/vim/after/ftplugin/perl.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'perl' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'perl'
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index 41fab89f..587062e5 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'php' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'php'
diff --git a/vim/after/ftplugin/sed.vim b/vim/after/ftplugin/sed.vim
index b3c3abc3..e16ec53d 100644
--- a/vim/after/ftplugin/sed.vim
+++ b/vim/after/ftplugin/sed.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'sed' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'sed'
diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim
index 5e4d9e99..05c3e293 100644
--- a/vim/after/ftplugin/sh.vim
+++ b/vim/after/ftplugin/sh.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'sh' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'sh'
diff --git a/vim/after/ftplugin/text.vim b/vim/after/ftplugin/text.vim
index 22b1c27b..cd35231e 100644
--- a/vim/after/ftplugin/text.vim
+++ b/vim/after/ftplugin/text.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'text' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'text'
diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index fa65a65a..5726e1e4 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'vim' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'vim'
@@ -20,18 +23,16 @@ nnoremap <buffer> <LocalLeader>l
let b:undo_ftplugin = b:undo_ftplugin
\ . '|nunmap <buffer> <LocalLeader>l'
-" Add undo commands to fix clearing buffer-local vim maps that the core
-" ftplugin leaves in place
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> [['
- \ . '|vunmap <buffer> [['
- \ . '|nunmap <buffer> ]]'
- \ . '|vunmap <buffer> ]]'
- \ . '|nunmap <buffer> []'
- \ . '|vunmap <buffer> []'
- \ . '|nunmap <buffer> ]['
- \ . '|vunmap <buffer> ]['
- \ . '|nunmap <buffer> ]"'
- \ . '|vunmap <buffer> ]"'
- \ . '|nunmap <buffer> ["'
- \ . '|vunmap <buffer> ["'
+" Just get rid of the core ftplugin's square-bracket maps; I don't use them
+silent! nunmap <buffer> [[
+silent! vunmap <buffer> [[
+silent! nunmap <buffer> ]]
+silent! vunmap <buffer> ]]
+silent! nunmap <buffer> []
+silent! vunmap <buffer> []
+silent! nunmap <buffer> ][
+silent! vunmap <buffer> ][
+silent! nunmap <buffer> ]"
+silent! vunmap <buffer> ]"
+silent! nunmap <buffer> ["
+silent! vunmap <buffer> ["
diff --git a/vim/after/ftplugin/zsh.vim b/vim/after/ftplugin/zsh.vim
index 4e56f428..eb5fc035 100644
--- a/vim/after/ftplugin/zsh.vim
+++ b/vim/after/ftplugin/zsh.vim
@@ -1,5 +1,8 @@
" Extra configuration for 'zsh' filetypes
-if &compatible || v:version < 700 || exists('b:did_ftplugin_after')
+if exists('b:did_ftplugin_after') || &compatible
+ finish
+endif
+if v:version < 700
finish
endif
if &filetype !=# 'zsh'
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 10:04:09 +0000