aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-11 11:22:34 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-11 11:22:34 +1200
commitec6a73d71a512dc89aaeda9d395c65ce0c760fca (patch)
treeb274b9b97aa443736bd2ea659912c2cadfa488b9
parent01a1cf6229232efb4bfc43b976a7ccd5466a6c6f (diff)
parent889886329a6b2651bc37466c0c990f6b9a825fd1 (diff)
downloaddotfiles-ec6a73d71a512dc89aaeda9d395c65ce0c760fca.tar.gz
Merge branch 'release/v4.23.0'v4.23.0
* release/v4.23.0: Bump VERSION Set up custom ftplugin for plain text files Refactor colorscheme logic a little Remove Vim 'grepprg' setting
-rw-r--r--VERSION4
-rw-r--r--vim/ftplugin/text.vim14
-rw-r--r--vim/vimrc30
3 files changed, 31 insertions, 17 deletions
diff --git a/VERSION b/VERSION
index b21e61f8..6b9b13a5 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.22.0
-Thu May 9 23:32:04 UTC 2019
+tejr dotfiles v4.23.0
+Fri May 10 23:22:34 UTC 2019
diff --git a/vim/ftplugin/text.vim b/vim/ftplugin/text.vim
new file mode 100644
index 00000000..a5dc810f
--- /dev/null
+++ b/vim/ftplugin/text.vim
@@ -0,0 +1,14 @@
+" The 'text' filetype was only added in v7.4.365, so anything older than this
+" requires our own filetype plugin to prevent the b:undo_ftplugin extensions
+" in after/ftplugin/text.vim from panicking.
+if v:version > 704
+ \ || v:version == 703 && has('patch365')
+ finish
+endif
+let b:did_ftplugin = 1
+
+" Set comment metacharacters
+setlocal comments+=fb:- " Dashed lists
+setlocal comments+=fb:* " Bulleted lists
+setlocal comments+=n:> " Mail quotes
+let b:undo_ftplugin = 'setlocal comments<'
diff --git a/vim/vimrc b/vim/vimrc
index 3a51a829..17282ce1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -27,21 +27,25 @@ if has('syntax')
syntax enable
endif
- " Use my colorscheme if using the GUI or if we have 256 colors
- if has('gui_running') || &t_Co >= 256
- silent! colorscheme sahara
- endif
+ " Colorscheme handling
+ try
+
+ " Use sahara.vim colorscheme, if using gVim or a 256-color term
+ if has('gui_running') || &t_Co >= 256
+ colorscheme sahara
+ else
+ throw 'Not loading sahara on this terminal'
+ endif
- " If my colorscheme loaded, turn on subtle 'cursorline' coloring
- if exists('colors_name') && colors_name ==# 'sahara'
+ " Use the colorscheme's subtle 'cursorline', if it loaded
if exists('+cursorline')
set cursorline
endif
- " If it didn't load, default to default scheme with dark background
- else
+ " Otherwise, use the default colorscheme with a dark background
+ catch
set background=dark
- endif
+ endtry
endif
@@ -78,8 +82,9 @@ if exists('+breakindent')
set breakindent
endif
-" Clear default 'comments' value, let the filetype handle it
+" Clear default 'comments' and 'commentstring', filetype to handle
set comments=
+set commentstring=
" Add completion options
if exists('+completeopt')
@@ -127,11 +132,6 @@ if v:version > 801
set formatoptions+=p
endif
-" If available, use GNU grep niceties for searching
-if system('grep --version') =~# '^grep (GNU grep)'
- set grepprg=grep\ -HnRs\ --exclude='.git*'
-endif
-
" Don't load GUI menus; set here before GUI starts
if has('gui_running')
set guioptions+=M