From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9E99B1386F3 for ; Fri, 14 Aug 2015 09:37:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3827B1427B; Fri, 14 Aug 2015 09:37:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7585414258 for ; Fri, 14 Aug 2015 09:37:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B0DC3408E5 for ; Fri, 14 Aug 2015 09:37:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FA7414A for ; Fri, 14 Aug 2015 09:37:20 +0000 (UTC) From: "Ben de Groot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben de Groot" Message-ID: <1439544993.e11e10747b61731a547e3389719a0d17e0962b91.yngwin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/neovim/files/nvimrc X-VCS-Directories: app-editors/neovim/files/ X-VCS-Committer: yngwin X-VCS-Committer-Name: Ben de Groot X-VCS-Revision: e11e10747b61731a547e3389719a0d17e0962b91 X-VCS-Branch: master Date: Fri, 14 Aug 2015 09:37:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f1eb6bff-2afb-4937-9243-e9405beb9119 X-Archives-Hash: 7b6927c1aaf6349c4520545d8b058a51 commit: e11e10747b61731a547e3389719a0d17e0962b91 Author: Ben de Groot gentoo org> AuthorDate: Fri Aug 14 08:10:03 2015 +0000 Commit: Ben de Groot gentoo org> CommitDate: Fri Aug 14 09:36:33 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11e1074 app-editors/neovim: refactor our default nvimrc Since neovim sets many sensible deafults now (see [1]), we can drop most general settings that were copied from app-editors/vim-core's vimrc. Also apply stripping whitespace only to *.e{build,class} and give users an easy way to turn that off (bug 557352). 1: https://github.com/neovim/neovim/issues/2676 Package-Manager: portage-2.2.20.1 app-editors/neovim/files/nvimrc | 99 ++++++++--------------------------------- 1 file changed, 18 insertions(+), 81 deletions(-) diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc index 316d867..635fc62 100644 --- a/app-editors/neovim/files/nvimrc +++ b/app-editors/neovim/files/nvimrc @@ -6,37 +6,10 @@ " "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc". " You may need to create these. -" {{{ General settings -" The following are some sensible defaults for Vim for most users. -set bs=2 " Allow backspacing over everything in insert mode -set ai " Always set auto-indenting on -set history=50 " keep 50 lines of command history -set ruler " Show the cursor position all the time -set formatoptions+=j " Delete comment character when joining commented lines - -" Don't use Ex mode, use Q for formatting -map Q gq - -" When doing tab completion, give the following files lower priority. You may -" wish to set 'wildignore' to completely ignore files, and 'wildmenu' to enable -" enhanced tab completion. These can be done in the user vimrc file. -set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo - -" When displaying line numbers, don't use an annoyingly wide number column. This -" doesn't enable line numbers -- :set number will do that. The value given is a -" minimum width to use for the number column, not a fixed size. -set numberwidth=3 - -" Use sensible whitespace indicators -set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+ -" }}} - -" {{{ Modeline settings -" We don't allow modelines by default. See bug #14088 and bug #73715. -" If you're not concerned about these, you can enable them on a per-user -" basis by adding "set modeline" to your ~/.vimrc file. -set nomodeline -" }}} +" Neovim comes with sensible defaults, see: +" https://github.com/neovim/neovim/issues/2676 +" Most of the general settings from Gentoo's vimrc have been dropped here. +" We add only some necessary fixes and a few Gentoo specific settings. " {{{ Locale settings " If we have a BOM, always honour that rather than trying to guess. @@ -52,44 +25,6 @@ if &fileencodings !~? "utf-8" endif " }}} -" {{{ Syntax highlighting settings -" Switch syntax highlighting on, when the terminal has colors -" Also switch on highlighting the last used search pattern. -if &t_Co > 2 || has("gui_running") - syntax on - set hlsearch -endif -" }}} - -" {{{ Terminal fixes -if &term ==? "xterm" - set t_Sb=^[4%dm - set t_Sf=^[3%dm - set ttymouse=xterm2 -endif - -if &term ==? "gnome" && has("eval") - " Set useful keys that vim doesn't discover via termcap but are in the - " builtin xterm termcap. See bug #122562. We use exec to avoid having to - " include raw escapes in the file. - exec "set =\eO5D" - exec "set =\eO5C" -endif -" }}} - -" {{{ Filetype plugin settings -" Enable plugin-provided filetype settings, but only if the ftplugin -" directory exists (which it won't on livecds, for example). -if isdirectory(expand("$VIMRUNTIME/ftplugin")) - filetype plugin on - - " Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided - " indent settings. Some people don't like these, so we won't turn them on by - " default. - " filetype indent on -endif -" }}} - " {{{ Fix &shell, see bug #101665. if "" == &shell if executable("/bin/bash") @@ -119,22 +54,21 @@ augroup gentoo " Note that the rules below are very minimal and don't cover everything. " Better to emerge app-vim/gentoo-syntax, which provides full syntax, " filetype and indent settings for all things Gentoo. - au BufRead,BufNewFile *.e{build,class} let is_bash=1|setfiletype sh au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab " In text files, limit the width of text to 78 characters, but be careful " that we don't override the user's setting. autocmd BufNewFile,BufRead *.txt \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") | - \ setlocal textwidth=78 | + \ setlocal textwidth=78 | \ endif " When editing a file, always jump to the last cursor position autocmd BufReadPost * \ if ! exists("g:leave_my_cursor_position_alone") | - \ if line("'\"") > 0 && line ("'\"") <= line("$") | - \ exe "normal g'\"" | - \ endif | + \ if line("'\"") > 0 && line ("'\"") <= line("$") | + \ exe "normal g'\"" | + \ endif | \ endif " When editing a crontab file, set backupcopy to yes rather than auto. See @@ -147,22 +81,25 @@ augroup gentoo " Except of course if a byte-order mark is in effect. autocmd BufReadPost * \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" && - \ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable | - \ set fileencoding= | + \ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable | + \ set fileencoding= | \ endif -augroup END + " Strip trailing spaces on write + autocmd BufWritePre *.e{build,class} + \ if ! exists("g:leave_my_trailing_space_alone") | + \ :%s/\s\+$//e | + \ endif -" Strip trailing spaces on write -autocmd BufWritePre * :%s/\s\+$//e +augroup END endif " has("autocmd") " }}} -" {{{ vimrc.local +" {{{ nvimrc.local if filereadable("/etc/vim/nvimrc.local") source /etc/vim/nvimrc.local endif " }}} -" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker : +" vim: set tw=80 sw=2 sts=2 et foldmethod=marker :