diff options
Diffstat (limited to 'editors/vim/files')
| -rw-r--r-- | editors/vim/files/patch-src_po_Makefile | 14 | ||||
| -rw-r--r-- | editors/vim/files/vimrc | 50 |
2 files changed, 30 insertions, 34 deletions
diff --git a/editors/vim/files/patch-src_po_Makefile b/editors/vim/files/patch-src_po_Makefile deleted file mode 100644 index ba0ffd232981..000000000000 --- a/editors/vim/files/patch-src_po_Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- src/po/Makefile.orig 2019-05-02 23:54:55 UTC -+++ src/po/Makefile -@@ -165,9 +165,9 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimex - po/gvim.desktop.in po/vim.desktop.in - mv -f ../$(PACKAGE).po $(PACKAGE).pot - --%.desktop: %.desktop.in $(POFILES) -+gvim.desktop vim.desktop: $@.in $(POFILES) - @echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS -- $(MSGFMT) --desktop -d . --template $< -o $@ -+ $(MSGFMT) --desktop -d . --template $@.in -o $@ - - update-po: $(LANGUAGES) - diff --git a/editors/vim/files/vimrc b/editors/vim/files/vimrc index cd041eb34648..b62c245beaa2 100644 --- a/editors/vim/files/vimrc +++ b/editors/vim/files/vimrc @@ -1,24 +1,34 @@ -if v:lang =~ "utf8$" || v:lang =~ "UTF-8$" - set fileencodings=ucs-bom,utf-8,latin1 -endif +set nocompatible " Enable Vim mode (instead of vi emulation) -let g:is_posix = 1 -set nocompatible -set bs=indent,eol,start -set history=50 -set ruler +let g:is_posix = 1 " Our /bin/sh is POSIX, not bash +set autoindent " Intelligent indentation matching +set autoread " Update the file if it's changed externally +set backspace=indent,eol,start " Allow backspacing over anything +set belloff=all " Turn off bells +set display=truncate " Show '@@@' when the last screen line overflows +set formatoptions+=j " Delete comment char when joining lines +set history=100 " Undo up to this many commands +set hlsearch " Highlight search results +set incsearch " Highlight search matches as you type them +set ruler " Show cursor position +set ttyfast " Redraw faster for smoother scrolling +set wildmenu " Show menu for tab completion in command mode -if &t_Co > 2 || has("gui_running") - syntax on - set hlsearch -endif +try + syntax on " Enable syntax highlighting +catch | endtry " vim-tiny is installed without the syntax files -if has("autocmd") - augroup freebsd - autocmd! - if $PORTSDIR != "" - autocmd BufNewFile $PORTSDIR/*/*/Makefile 0r $PORTSDIR/Templates/Makefile - else - autocmd BufNewFile /usr/ports/*/*/Makefile 0r /usr/ports/Templates/Makefile - endif +if v:lang =~ "utf8$" || v:lang =~ "UTF-8$" + set fileencodings=ucs-bom,utf-8,latin1 endif + +" CTRL-L will mute highlighted search results +nnoremap <silent> <C-l> :<C-u>nohlsearch<CR><C-l> + +augroup FreeBSD + autocmd! + autocmd BufNewFile /usr/ports/*/*/Makefile 0r /usr/ports/Templates/Makefile + if !empty($PORTSDIR) + autocmd BufNewFile $PORTSDIR/*/*/Makefile 0r $PORTSDIR/Templates/Makefile + endif +augroup END |