From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] support a few of the new features of C++11 in syntax highlighting Date: Wed, 14 May 2014 20:13:53 +0000 Message-ID: <20140514201353.GA4125@acm.acm> References: <536F1D36.6010307@gmail.com> <87ppjks3th.fsf@wanadoo.es> <87lhu8rrtm.fsf@wanadoo.es> <20140511220947.GD2759@acm.acm> <87ha4wrle6.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1400098714 1783 80.91.229.3 (14 May 2014 20:18:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 14 May 2014 20:18:34 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 14 22:18:26 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Wkfd6-0006n9-WD for ged-emacs-devel@m.gmane.org; Wed, 14 May 2014 22:18:21 +0200 Original-Received: from localhost ([::1]:54279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wkfd6-0007AP-F8 for ged-emacs-devel@m.gmane.org; Wed, 14 May 2014 16:18:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wkfcy-00079K-85 for emacs-devel@gnu.org; Wed, 14 May 2014 16:18:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wkfcs-0007uW-FZ for emacs-devel@gnu.org; Wed, 14 May 2014 16:18:12 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:24752 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wkfcs-0007uL-5v for emacs-devel@gnu.org; Wed, 14 May 2014 16:18:06 -0400 Original-Received: (qmail 4761 invoked by uid 3782); 14 May 2014 20:18:02 -0000 Original-Received: from acm.muc.de (pD95188C2.dip0.t-ipconnect.de [217.81.136.194]) by colin.muc.de (tmda-ofmipd) with ESMTP; Wed, 14 May 2014 22:18:01 +0200 Original-Received: (qmail 4444 invoked by uid 1000); 14 May 2014 20:13:53 -0000 Content-Disposition: inline In-Reply-To: <87ha4wrle6.fsf@wanadoo.es> User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:171842 Archived-At: Hello, Óscar. On Mon, May 12, 2014 at 12:38:41AM +0200, Óscar Fuentes wrote: > Alan Mackenzie writes: > >> So Alan noticed the patch, but the "no" still stands: the patch was not > >> merged and there was no conclusion about it (except for Alan saying that > >> he already implemented on the SF cc-mode some of the features mentioned > >> on the patch and that he has no time for merging those changes into > >> Emacs.) > > These features are available in the c++11-0-1 branch of the CC Mode > > repository at http://hg.code.sf.net/p/cc-mode/cc-mode, best downloaded by > > prefixing the address with 'hg clone ', and appending it with a new > > directory name. > > As already stated, help in implementing further C++11 features would be > > welcome. > I would be more interested on helping to incorporate into Emacs the > features already implemented on the SF repository. > What can I do about that? OK. I suggest proceeding as follows. First download the CC Mode (Mercurial) repository, as detailed above. Then get the diff between the "default" branch (i.e. the trunk) and the c++11-0-1 branch for the files cc-*.el: hg diff -r default:c++11-0-1 cc-*.el > foo.diff . Then (the hard part), disregarding the irrelevant diff hunks in that file (e.g. changes in the copyright statement), apply the diffs to the CC Mode files in the Emacs trunk. This will likely involve a fair bit of hand editing. Please do this job very carefully - it would be a knightmare to untangle if you were to make mistakes here. Before committing this it would be best to test it using the regression test suite in the directory ...../tests. See the comments in the file ..../tests/000tests.el for instructions. You'll need to move the entire ..../tests directory to under ..../lisp/progmodes (or set up appropriate symbolic links) for this to work. As a commit message, could you copy them from the CC Mode repository, please. All the commits in the c++-11-0-1 branch can be got reasonably with: hg -v log -X .hgtags -b c++11-0-1 . All the commits in default can similarly be got with hg -v log -X .hgtags -b default . Whatever changes are in c++-11-0-1 which aren't in default are the new C++11 features. They should form the basis of your commit message. If you need any help, just email me. Good luck! -- Alan Mackenzie (Nuremberg, Germany).