From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Toon Claes Newsgroups: gmane.emacs.bugs Subject: bug#11865: Fwd: Re: 24.1.50; doxygen comments not highlighted in c++-mode Date: Thu, 10 Mar 2016 09:58:56 +0100 Message-ID: <9D6D35E4-B589-4E47-8939-7D682F93AE74@iotcl.com> References: <5a95c7556a411b5988bc46867dbb99fd@tonotdo.com> <16d1f96d86592f9e5511b61a678e2f81@tonotdo.com> <87y4a8m9b2.fsf@gnus.org> <0C474D0B-86AF-4030-B4B4-87E8CBEC4A67@iotcl.com> <87d1rilrxu.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 9.2 \(3112\)) Content-Type: multipart/signed; boundary="Apple-Mail=_9E346CDA-0E47-406D-A33E-38A321E07EC4"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Trace: ger.gmane.org 1457627677 29462 80.91.229.3 (10 Mar 2016 16:34:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 10 Mar 2016 16:34:37 +0000 (UTC) Cc: Toon Claes , 11865@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 10 17:34:23 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1ae3Xa-0000oD-50 for geb-bug-gnu-emacs@m.gmane.org; Thu, 10 Mar 2016 17:34:22 +0100 Original-Received: from localhost ([::1]:49448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae3XZ-0003Sv-Db for geb-bug-gnu-emacs@m.gmane.org; Thu, 10 Mar 2016 11:34:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae3XP-0003IV-NB for bug-gnu-emacs@gnu.org; Thu, 10 Mar 2016 11:34:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ae3XM-0007hs-2Q for bug-gnu-emacs@gnu.org; Thu, 10 Mar 2016 11:34:11 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:46890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae3XH-0007ev-ES; Thu, 10 Mar 2016 11:34:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1ae3XH-0004gc-AR; Thu, 10 Mar 2016 11:34:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Toon Claes Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Thu, 10 Mar 2016 16:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11865 X-GNU-PR-Package: emacs,cc-mode X-GNU-PR-Keywords: fixed Original-Received: via spool by 11865-submit@debbugs.gnu.org id=B11865.145762762717900 (code B ref 11865); Thu, 10 Mar 2016 16:34:03 +0000 Original-Received: (at 11865) by debbugs.gnu.org; 10 Mar 2016 16:33:47 +0000 Original-Received: from localhost ([127.0.0.1]:44015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1ae3Wx-0004ea-O4 for submit@debbugs.gnu.org; Thu, 10 Mar 2016 11:33:47 -0500 Original-Received: from relay4-d.mail.gandi.net ([217.70.183.196]:33685) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adwQz-0006nd-3M for 11865@debbugs.gnu.org; Thu, 10 Mar 2016 03:59:08 -0500 Original-Received: from mfilter30-d.gandi.net (mfilter30-d.gandi.net [217.70.178.161]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 1816E1720B8; Thu, 10 Mar 2016 09:59:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter30-d.gandi.net Original-Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter30-d.gandi.net (mfilter30-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 1OgAOhEN9Trd; Thu, 10 Mar 2016 09:59:02 +0100 (CET) X-Originating-IP: 84.196.71.131 Original-Received: from [192.168.1.60] (d54C44783.access.telenet.be [84.196.71.131]) (Authenticated sender: toon@iotcl.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id D2DCA1720B2; Thu, 10 Mar 2016 09:59:01 +0100 (CET) X-Pgp-Agent: GPGMail 2.6b2 In-Reply-To: <87d1rilrxu.fsf@gnus.org> X-Mailer: Apple Mail (2.3112) X-Mailman-Approved-At: Thu, 10 Mar 2016 11:33:42 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:114716 Archived-At: --Apple-Mail=_9E346CDA-0E47-406D-A33E-38A321E07EC4 Content-Type: multipart/mixed; boundary="Apple-Mail=_DC3BF0C6-FACC-433B-AB3C-F1BD90915B81" --Apple-Mail=_DC3BF0C6-FACC-433B-AB3C-F1BD90915B81 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Hi Lars, Find the patch attached. The regexp is written to match: /** gtkdoc */ /** * gtkdoc */ And to not match: /*******/ Kind regards, Toon --Apple-Mail=_DC3BF0C6-FACC-433B-AB3C-F1BD90915B81 Content-Disposition: attachment; filename=0001-Fix-Bug-11865.patch Content-Type: application/octet-stream; name="0001-Fix-Bug-11865.patch" Content-Transfer-Encoding: quoted-printable =46rom=2094c9c1c92f326de5e813780f8230f1ae3d4a6e96=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Toon=20Claes=20=0ADate:=20Thu,=20= 10=20Mar=202016=2009:38:11=20+0100=0ASubject:=20[PATCH]=20Fix=20= Bug#11865=0A=0A*=20progmodes/cc-vars.el=20(c-doc-comment-style):=20Set=20= gtkdoc=20the=0Adefault=20for=20c++-mode.=0A*=20progmodes/cc-fonts.el=20= (gtkdoc-font-lock-keywords):=20Text=20inside=0AGtkDoc=20comment=20can=20= be=20on=20the=20same=20line=20as=20the=20comment=20start=20"/**".=0A---=0A= =20ChangeLog.2=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=209=20= +++++++++=0A=20lisp/progmodes/cc-fonts.el=20|=202=20+-=0A=20= lisp/progmodes/cc-vars.el=20=20|=205=20+++--=0A=203=20files=20changed,=20= 13=20insertions(+),=203=20deletions(-)=0A=0Adiff=20--git=20a/ChangeLog.2=20= b/ChangeLog.2=0Aindex=205253a92..7ba1872=20100644=0A---=20a/ChangeLog.2=0A= +++=20b/ChangeLog.2=0A@@=20-1,3=20+1,12=20@@=0A+2016-03-10=20=20Toon=20= Claes=20=0A+=0A+=09Fix=20Bug#11865=0A+=0A+=09*=20= progmodes/cc-vars.el=20(c-doc-comment-style):=20Set=20gtkdoc=20the=0A+=09= default=20for=20c++-mode.=0A+=09*=20progmodes/cc-fonts.el=20= (gtkdoc-font-lock-keywords):=20Text=20inside=0A+=09GtkDoc=20comment=20= can=20be=20on=20the=20same=20line=20as=20the=20comment=20start=20"/**".=0A= +=0A=202016-03-04=20=20Michael=20Albinus=20=20=0A= =20=0A=20=09Fix=20Bug#22859=0Adiff=20--git=20= a/lisp/progmodes/cc-fonts.el=20b/lisp/progmodes/cc-fonts.el=0Aindex=20= a7097b9..6bbb8f4=20100644=0A---=20a/lisp/progmodes/cc-fonts.el=0A+++=20= b/lisp/progmodes/cc-fonts.el=0A@@=20-2515,7=20+2515,7=20@@=20need=20for=20= `pike-font-lock-extra-types'.")=0A=20=0A=20(defconst=20= gtkdoc-font-lock-keywords=0A=20=20=20`((,(lambda=20(limit)=0A-=09= (c-font-lock-doc-comments=20"/\\*\\*$"=20limit=0A+=09= (c-font-lock-doc-comments=20"/\\*\\*\\([^\\*].*\\)?$"=20limit=0A=20=09=20= =20gtkdoc-font-lock-doc-comments)=0A=20=09(c-font-lock-doc-comments=20= "/\\*<=20"=20limit=0A=20=09=20=20gtkdoc-font-lock-doc-protection)=0Adiff=20= --git=20a/lisp/progmodes/cc-vars.el=20b/lisp/progmodes/cc-vars.el=0A= index=20a695718..9783516=20100644=0A---=20a/lisp/progmodes/cc-vars.el=0A= +++=20b/lisp/progmodes/cc-vars.el=0A@@=20-550,7=20+550,8=20@@=20variable=20= in=20a=20mode=20hook."=0A=20(defcustom-c-stylevar=20c-doc-comment-style=0A= =20=20=20'((java-mode=20.=20javadoc)=0A=20=20=20=20=20(pike-mode=20.=20= autodoc)=0A-=20=20=20=20(c-mode=20=20=20=20.=20gtkdoc))=0A+=20=20=20=20= (c-mode=20=20=20=20.=20gtkdoc)=0A+=20=20=20=20(c++-mode=20=20.=20= gtkdoc))=0A=20=20=20"*Specifies=20documentation=20comment=20style(s)=20= to=20recognize.=0A=20This=20is=20primarily=20used=20to=20fontify=20doc=20= comments=20and=20the=20markup=20within=0A=20them,=20e.g.=20Javadoc=20= comments.=0A@@=20-560,7=20+561,7=20@@=20comment=20styles:=0A=20=0A=20=20= javadoc=20--=20Javadoc=20style=20for=20\"/**=20...=20*/\"=20comments=20= (default=20in=20Java=20mode).=0A=20=20autodoc=20--=20Pike=20autodoc=20= style=20for=20\"//!=20...\"=20comments=20(default=20in=20Pike=20mode).=0A= -=20gtkdoc=20=20--=20GtkDoc=20style=20for=20\"/**=20...=20**/\"=20= comments=20(default=20in=20C=20mode).=0A+=20gtkdoc=20=20--=20GtkDoc=20= style=20for=20\"/**=20...=20**/\"=20comments=20(default=20in=20C/C++=20= mode).=0A=20=0A=20The=20value=20may=20also=20be=20a=20list=20of=20doc=20= comment=20styles,=20in=20which=20case=20all=0A=20of=20them=20are=20= recognized=20simultaneously=20(presumably=20with=20markup=20cues=0A--=20=0A= 2.7.1=0A=0A= --Apple-Mail=_DC3BF0C6-FACC-433B-AB3C-F1BD90915B81 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii > On 27 Feb 2016, at 05:04, Lars Ingebrigtsen wrote: > > Toon Claes writes: > >> I do not really agree. >> >> Let me explain in detail. >> Only comment blocks like the following were recognized as gtkdoc: >> /** >> * This is the gtkdoc comment >> */ >> >> I wanted also gtkdoc styling to be applied to: >> /** This should be gtkdoc comment too */ >> >> I admit, the regexp I wrote back in the day was not correctly escaped. >> But I was trying to achieve comments with 3 or more asterisks would >> not get styled like gtkdoc comments. > > Can you supply a patch that will give the correct styling? > > -- > (domestic pets only, the antidote for overdose, milk.) > bloggy blog: http://lars.ingebrigtsen.no --Apple-Mail=_DC3BF0C6-FACC-433B-AB3C-F1BD90915B81-- --Apple-Mail=_9E346CDA-0E47-406D-A33E-38A321E07EC4 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJW4TdVAAoJEDEUOoLTKziXRQsP/0KiB8UHbnHSsSPKnZehQify 1HCt+0OB9dtSFX5KApbPLTR+5qy9nhjGAKoCA19Yq/C5fGi4stGkZVTTb84oH4Kr x+H0GDdYBSjG4kQyFENtjmmv7dZyfXJPPjn38A9rEeLZAL2LV04hX5XJNWYcLuJ8 XQ+Gz7l2leHfUdsLLtoRyEjBkZ6rKD+3YzlJXYXscDpXJTCU/iqnANyVE4raZF87 9NlfH4V2YPvVYs2vEAziqIqwOlvMOQ2Sv1nyTvsxsaM9bOjr7uA1D2j8jgGfuZHL /oxbJu9tPBz3aZBVV+c4DbWL/cb7orw61h1p9XEPvRunrEvPrzKXz2Vbxd1OsEUQ ASFJc6TFMJOhqvxfGkWzUruupZgv6MOIocFN1LNgbrX0rZV2yBLFYrNYQhUimYmY R8HOD2w3YKh/t8Cz6Vx/q4uJscFdJsSGThAfIhlsO/WDM1CAW292FKoSyX+wPoMD 0YRA7Jf0NGUTOBgHVJeLX9zluKf440SVG8VjNGyk8dMAbX/2HyXHFwgrcZ20OBq9 cUG7AH1LAKI9Nl8u9di/X0lQCqY8DdTyLnr1bhTGbrLOZCG3BA+RXIQVoRHl9ipx yJrL+raXIy7SLLtINVKpjwaSBLxwV/BOwPW5Af1C5/w+zNLoN1oYO8i7jar194E6 bVya56D7skd2hP+IHB6Y =h8ts -----END PGP SIGNATURE----- --Apple-Mail=_9E346CDA-0E47-406D-A33E-38A321E07EC4--