From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17979 invoked by alias); 16 Sep 2014 21:59:54 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 17965 invoked by uid 89); 16 Sep 2014 21:59:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.mozilla.org Received: from mx1.corp.phx1.mozilla.com (HELO smtp.mozilla.org) (63.245.216.69) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 16 Sep 2014 21:59:51 +0000 Received: from tsaunders-iceball.corp.tor1.mozilla.com (unknown [64.213.68.131]) (Authenticated sender: tsaunders@mozilla.com) by mx1.mail.corp.phx1.mozilla.com (Postfix) with ESMTPSA id 58224F22ED; Tue, 16 Sep 2014 14:59:48 -0700 (PDT) Date: Tue, 16 Sep 2014 21:59:00 -0000 From: Trevor Saunders To: Yury Gribov Cc: GCC Patches , Laurynas Biveinis , Jeff Law , Segher Boessenkool , Richard Biener , Bernhard Reutner-Fischer , Mike Stump Subject: Re: [PATCHv3] Vimrc config with GNU formatting Message-ID: <20140916215858.GA20924@tsaunders-iceball.corp.tor1.mozilla.com> References: <540863C1.4000909@samsung.com> <54100735.5040700@samsung.com> <541867A2.6020405@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <541867A2.6020405@samsung.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes X-SW-Source: 2014-09/txt/msg01322.txt.bz2 On Tue, Sep 16, 2014 at 08:38:58PM +0400, Yury Gribov wrote: > Hi all, > > This is the third version of the patch. A list of changes since last > version: > * move config to contrib so that it's _not_ enabled by default (current > score is 2/1 in favor of no Vim config by default) fwiw, I think enabling it by default especially when that really means enable it if you've enabled the localrc plugin makes sense. I don't see how you can enable the localrc plugin and then complain when people use it for its designed purpose. However something in contrib/ is probably easier for new people to find than something on the wiki or something so better than doing nothing :) Thanks! Trev > * update Makefile.in to make .local.vimrc if developer asks for it > * disable autoformatting for flex files > * fix filtering of non-GNU sources (libsanitizer) > * added some small fixes in cinoptions based on feedback from community > > As noted by Richard, the config does not do a good job of formatting unbound > {} blocks e.g. > void > foo () > { > int x; > { > // I'm an example of bad bad formatting > } > } > but it seems to be the best we can get with Vim's cindent > (and I don't think anyone seriously considers writing a custom indentexpr). > > Ok to commit? > > -Y > commit 67219512dac9a5cc14eea8f157222a226044dd72 > Author: Yury Gribov > Date: Thu Sep 4 16:55:44 2014 +0400 > > 2014-09-16 Laurynas Biveinis > Yury Gribov > > Vim config with GNU formatting. > > contrib/ > * vimrc: New file. > > / > * .gitignore: Added .local.vimrc. > * Makefile.tpl (.local.vimrc): New target. > * Makefile.in: Regenerate. > > diff --git a/.gitignore b/.gitignore > index e9b56be..252b8b0 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -32,6 +32,8 @@ POTFILES > TAGS > TAGS.sub > > +.local.vimrc > + > .gdbinit > .gdb_history > > diff --git a/Makefile.in b/Makefile.in > index d6105b3..e573069 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -2384,6 +2384,11 @@ mail-report-with-warnings.log: warning.log > chmod +x $@ > echo If you really want to send e-mail, run ./$@ now > > +# Local Vim config > + > +vimrc: > + (cd $(srcdir); $(LN_S) contrib/vimrc .local.vimrc) > + > # Installation targets. > > .PHONY: install uninstall > diff --git a/Makefile.tpl b/Makefile.tpl > index f7c7e38..d050694 100644 > --- a/Makefile.tpl > +++ b/Makefile.tpl > @@ -867,6 +867,11 @@ mail-report-with-warnings.log: warning.log > chmod +x $@ > echo If you really want to send e-mail, run ./$@ now > > +# Local Vim config > + > +vimrc: > + (cd $(srcdir); $(LN_S) contrib/vimrc .local.vimrc) > + > # Installation targets. > > .PHONY: install uninstall > diff --git a/contrib/vimrc b/contrib/vimrc > new file mode 100644 > index 0000000..7287bd1 > --- /dev/null > +++ b/contrib/vimrc > @@ -0,0 +1,43 @@ > +" Code formatting settings for Vim. > +" > +" To enable this for GCC files by default, install thinca's localrc plugin > +" and do > +" $ make .local.vimrc > +" Or if you dislike plugins, add autocmd in your .vimrc: > +" :au BufNewFile,BufReadPost path/to/gcc/* :so path/to/gcc/.local.vimrc > +" Or just source file manually every time if you are masochist: > +" :so .local.vimrc > +" > +" Copyright (C) 2014 Free Software Foundation, Inc. > +" > +" This program is free software; you can redistribute it and/or modify > +" it under the terms of the GNU General Public License as published by > +" the Free Software Foundation; either version 3 of the License, or > +" (at your option) any later version. > +" > +" This program is distributed in the hope that it will be useful, > +" but WITHOUT ANY WARRANTY; without even the implied warranty of > +" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +" GNU General Public License for more details. > +" > +" You should have received a copy of the GNU General Public License > +" along with this program. If not, see . > + > +function! SetStyle() > + let l:fname = expand("%:p") > + if stridx(l:fname, 'libsanitizer') != -1 > + return > + endif > + let l:ext = fnamemodify(l:fname, ":e") > + let l:c_exts = ['c', 'h', 'cpp', 'cc', 'C', 'H', 'def', 'java'] > + if index(l:c_exts, l:ext) != -1 > + setlocal cindent > + setlocal shiftwidth=2 > + setlocal softtabstop=2 > + setlocal cinoptions=>2s,n-s,{s,^-s,:s,=s,g0,f0,hs,p2s,t0,+s,(0,u0,w1,m0 > + setlocal textwidth=79 > + setlocal formatoptions-=ro formatoptions+=cql > + endif > +endfunction > + > +call SetStyle()