aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-16 13:16:29 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-16 13:16:29 +1200
commit4274fab5fcddfe9dfef804de826a90aa4eb37db4 (patch)
treec6979a314d76266da2221c960488468ab3ac7256
parente18bf97f3f709a7213f94f9f161f45f0c3f6ccfc (diff)
parent8f581b83461bde2d2ad88593e3c8cfb3b377b36d (diff)
downloaddotfiles-4.28.0.tar.gz (sig)
dotfiles-4.28.0.zip
Merge branch 'release/v4.28.0'v4.28.0
* release/v4.28.0: Bump VERSION Update to vim-perl-version-bump v1.1.2 Turns out I'm not actually using 'wildmenu' Try ternary operator for $MYVIMRUNTIME setting Revert "Remove redundant :pwd from mapping" Use consistent version support specification
-rw-r--r--VERSION4
m---------vim/bundle/perl_version_bump0
-rw-r--r--vim/vimrc33
3 files changed, 18 insertions, 19 deletions
diff --git a/VERSION b/VERSION
index a208ef25..bf278408 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.27.0
-Mon May 13 23:52:55 UTC 2019
+tejr dotfiles v4.28.0
+Thu May 16 01:16:29 UTC 2019
diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump
-Subproject e28fe8b762612978f1096b82f5387af7e13cd16
+Subproject 660609b99f6e82c769096f6bd3b6d0a615c3ebc
diff --git a/vim/vimrc b/vim/vimrc
index dbdda4e3..915b02b0 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -6,11 +6,11 @@ runtime system.vim
" Set an environment variable for the user runtime directory
if !exists('$MYVIMRUNTIME')
- if has('win32') || has('win64')
- let $MYVIMRUNTIME = expand('~/vimfiles')
- else
- let $MYVIMRUNTIME = expand('~/.vim')
- endif
+ let $MYVIMRUNTIME = expand(
+ \ has('win32') || has('win64')
+ \ ? '~/vimfiles'
+ \ : '~/.vim'
+ \ )
endif
" Load filetype settings, plugins, and maps
@@ -43,7 +43,7 @@ set backspace+=indent " Spaces from 'autoindent'
set backspace+=start " The start of current insertion
" Try to keep backups in one system-appropriate dir, including full encoded
-" path in filename (trailing double slash) if supported (8.1.0251)
+" path in filename (trailing double slash) if supported (v8.1.251)
set backup
if v:version > 801
\ || v:version == 801 && has('patch251')
@@ -59,7 +59,7 @@ if has('unix')
set backupskip^=/var/tmp/* " Hardcoded path for `sudo -e`
endif
-" Indent wrapped lines if supported
+" Indent wrapped lines if supported (v7.4.338)
if exists('+breakindent')
set breakindent
endif
@@ -100,13 +100,13 @@ endif
set foldlevelstart=99
set foldmethod=indent
-" Delete comment leaders when joining lines, if supported
+" Delete comment leaders when joining lines, if supported (v7.3.541)
if v:version > 703
\ || v:version == 703 && has('patch541')
set formatoptions+=j
endif
-" Don't break a single space after a period, if supported
+" Don't break a single space after a period, if supported (v8.1.728)
if v:version > 801
\ || v:version == 801 && has('patch728')
set formatoptions+=p
@@ -134,7 +134,7 @@ set include=
set incsearch
" Don't show a statusline if there's only one window
-" This is the Vim default, but NeoVim changed it
+" This is Vim's default, but not NeoVim's
if &laststatus != 1
set laststatus=1
endif
@@ -163,7 +163,7 @@ set path-=/usr/include " Let the C/C++ filetypes set that
set path+=** " Search current directory's whole tree
" Disable command line display of file position
-" This is the Vim default, but NeoVim changed it
+" This is Vim's default, but not NeoVim's
if &ruler
set noruler
endif
@@ -188,18 +188,17 @@ if &ttymouse !=# ''
set ttymouse=
endif
-" Try to keep persistent undo files in one system-appropriate dir, including
-" full encoded path in filename (trailing double slash)
+" Try to keep persistent undo files in one system-appropriate dir (v7.2.438),
+" including full encoded path in filename (trailing double slash)
if has('persistent_undo')
set undofile
set undodir^=$MYVIMRUNTIME/cache/undo//
endif
-" Wildmenu settings; see also plugin/wildignore.vim
-set wildmenu " Use wildmenu
+" Tab completion settings; see also plugin/wildignore.vim
set wildmode=list:longest " Tab press completes and lists
if exists('+wildignorecase')
- set wildignorecase " Case insensitive, if supported
+ set wildignorecase " Case insensitive, if supported (v7.3.072)
endif
" Let me move beyond buffer text in visual block mode
@@ -279,7 +278,7 @@ nnoremap <Leader>f :<C-U>setlocal formatoptions?<CR>
nnoremap <Leader>F :<C-U>doautocmd filetypedetect BufRead<CR>
" \g changes directory to the current file's location
-nnoremap <Leader>g :<C-U>cd %:h<CR>
+nnoremap <Leader>g :<C-U>cd %:h<CR>:pwd<CR>
" \h toggles highlighting search results
nnoremap <Leader>h :<C-U>set hlsearch! hlsearch?<CR>