diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2023-08-03 09:39:28 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2023-08-03 09:39:28 +1200 |
| commit | be48618896bdfd0b238b19cae609a6da48c358be (patch) | |
| tree | faac1db499973c99a58655c3ff2c139ccb8a2f67 /vim | |
| parent | Merge branch 'release/v12.40.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-master.tar.gz dotfiles-master.zip | |
* release/v12.41.0:
Handle unset b:undo_ftplugin in Python Vim
Add Vim filetype detection for Rust
Set exports filetype in Vim
Add missing comment to filetype.vim
Correct double-up in Vim python 'equalprg'
Add keybinding for rofi password-store login
Add username-typing to rofi password-store script
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/after/ftplugin/python.vim | 10 | ||||
| -rw-r--r-- | vim/filetype.vim | 9 |
2 files changed, 18 insertions, 1 deletions
diff --git a/vim/after/ftplugin/python.vim b/vim/after/ftplugin/python.vim index b5071e3b..2ca1ae89 100644 --- a/vim/after/ftplugin/python.vim +++ b/vim/after/ftplugin/python.vim @@ -1,3 +1,11 @@ +" The Python runtime files didn't define b:undo_ftplugin until Vim v8.1.1048; +" if it's not set yet, set it here (to something innoccuous) so that the +" appending :let commands in the rest of this file don't break. +" +if !exists('b:undo_ftplugin') + let b:undo_ftplugin = 'setlocal tabstop<' +endif + " Use pyflakes for syntax checking and autopep8 for tidying compiler pyflakes if executable('autopep8') @@ -20,7 +28,7 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>c' " Mappings to choose 'equalprg' nnoremap <buffer> <LocalLeader>t - \ :<C-U>setlocal equalprg=equalprg=autopep8\ -aaa\ --\ -<CR> + \ :<C-U>setlocal equalprg=autopep8\ -aaa\ --\ -<CR> nnoremap <buffer> <LocalLeader>i \ :<C-U>setlocal equalprg<<CR> let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>t' diff --git a/vim/filetype.vim b/vim/filetype.vim index 4b0a5702..eea7f1f5 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -73,6 +73,7 @@ augroup filetypedetect \ sources.list \,*/etc/apt/sources.list.d/*.list \ setfiletype debsources + " Desktop files autocmd BufNewFile,BufRead \ ?*.desktop \,?*.directory @@ -94,6 +95,10 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.dot \ setfiletype dot + " NFS exports + autocmd BufNewFile,BufRead + \ exports + \ setfiletype exports " Forth autocmd BufNewFile,BufRead \ ?*.fs,?*.ft @@ -363,6 +368,10 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ ?*.rb \ setfiletype ruby + " Rust + autocmd BufNewFile,BufRead + \ ?*.rs + \ setfiletype rust " Samba config autocmd BufNewFile,BufRead \ smb.conf |