aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--VERSION4
-rw-r--r--vim/after/plugin/2html.vim11
-rw-r--r--vim/after/plugin/spellfile_local.vim5
-rw-r--r--vim/autoload/put_date.vim24
m---------vim/bundle/detect_indent0
m---------vim/bundle/put_date0
m---------vim/bundle/squeeze_repeat_blanks0
-rw-r--r--vim/plugin/2html.vim5
-rw-r--r--vim/plugin/put_date.vim6
10 files changed, 24 insertions, 37 deletions
diff --git a/.gitmodules b/.gitmodules
index 6a023a9b..e892cefb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,6 +14,9 @@
[submodule "vim/bundle/cursorline_current"]
path = vim/bundle/cursorline_current
url = https://sanctum.geek.nz/code/vim-cursorline-current.git
+[submodule "vim/bundle/detect_indent"]
+ path = vim/bundle/detect_indent
+ url = https://sanctum.geek.nz/code/vim-detect-indent.git
[submodule "vim/bundle/digraph_search"]
path = vim/bundle/digraph_search
url = https://sanctum.geek.nz/code/vim-digraph-search.git
@@ -41,6 +44,9 @@
[submodule "vim/bundle/put_blank_lines"]
path = vim/bundle/put_blank_lines
url = https://sanctum.geek.nz/code/vim-put-blank-lines.git
+[submodule "vim/bundle/put_date"]
+ path = vim/bundle/put_date
+ url = https://sanctum.geek.nz/code/vim-put-date.git
[submodule "vim/bundle/quickfix_auto_open"]
path = vim/bundle/quickfix_auto_open
url = https://sanctum.geek.nz/code/vim-quickfix-auto-open.git
diff --git a/VERSION b/VERSION
index 3df1d48e..d3f4b56f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v9.10.6
-Fri, 29 May 2020 04:11:33 +0000
+tejr dotfiles v9.15.0
+Sat, 30 May 2020 13:55:44 +0000
diff --git a/vim/after/plugin/2html.vim b/vim/after/plugin/2html.vim
new file mode 100644
index 00000000..dd65486d
--- /dev/null
+++ b/vim/after/plugin/2html.vim
@@ -0,0 +1,11 @@
+" Don't make these settings if the base plugin didn't load
+if !exists('g:loaded_2html_plugin')
+ finish
+endif
+
+" Set preferred fonts for the HTML rendering
+let g:html_font = [
+ \ 'DejaVu Sans Mono',
+ \ 'Ubuntu Mono',
+ \ 'Consolas',
+ \]
diff --git a/vim/after/plugin/spellfile_local.vim b/vim/after/plugin/spellfile_local.vim
index 1655e78c..7d805660 100644
--- a/vim/after/plugin/spellfile_local.vim
+++ b/vim/after/plugin/spellfile_local.vim
@@ -1,3 +1,8 @@
+" Don't make these settings if the base plugin didn't load
+if !exists('g:loaded_spellfile_local')
+ finish
+endif
+
" Use XDG dirs for 'spellfile' if XDG_DATA_HOME is useable
if xdg#DataHome() !=# ''
let g:spellfile_local_dirs = [ xdg#DataHome() ]
diff --git a/vim/autoload/put_date.vim b/vim/autoload/put_date.vim
deleted file mode 100644
index b0b0b548..00000000
--- a/vim/autoload/put_date.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-" RFC2822 format string for strftime()
-let s:rfc_2822 = '%a, %d %b %Y %T %z'
-
-" Write a date to the buffer, UTC or local, in the specified format,
-" defaulting to RFC2822; formats are provided without the leading % signs
-" before each letter, like PHP date()
-"
-function! put_date#(line, utc, format) abort
- let line = a:line
- let utc = a:utc
- let format = strlen(a:format)
- \ ? substitute(a:format, '\a', '%&', 'g')
- \ : s:rfc_2822
- if utc
- if exists('$TZ')
- let tz = $TZ
- endif
- let $TZ = 'UTC'
- endif
- execute line.'put =strftime(format)'
- if exists('tz')
- let $TZ = tz
- endif
-endfunction
diff --git a/vim/bundle/detect_indent b/vim/bundle/detect_indent
new file mode 160000
+Subproject 4b364f096f9c5ad06daa99f5d302e0b07424f0b
diff --git a/vim/bundle/put_date b/vim/bundle/put_date
new file mode 160000
+Subproject 598090797c2cb3a4fe945d2eacd3eca42a0cfe5
diff --git a/vim/bundle/squeeze_repeat_blanks b/vim/bundle/squeeze_repeat_blanks
-Subproject d80bc3733cf19eb72111171bee269306222d67b
+Subproject 27dd1b5858b4839b34249c106d2b3963a3da416
diff --git a/vim/plugin/2html.vim b/vim/plugin/2html.vim
deleted file mode 100644
index 51d377e3..00000000
--- a/vim/plugin/2html.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:html_font = [
- \ 'DejaVu Sans Mono',
- \ 'Ubuntu Mono',
- \ 'Consolas',
- \]
diff --git a/vim/plugin/put_date.vim b/vim/plugin/put_date.vim
deleted file mode 100644
index 7848e95f..00000000
--- a/vim/plugin/put_date.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-if exists('loaded_put_date') || &compatible || !exists('*strftime')
- finish
-endif
-let loaded_put_date = 1
-command! -bang -bar -nargs=* -range PutDate
- \ call put_date#(<q-line1>, <q-bang> ==# '!', <q-args>)