From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#11865: Fwd: Re: 24.1.50; doxygen comments not highlighted in c++-mode Date: Thu, 27 Jun 2019 17:10:05 +0200 Message-ID: References: <5a95c7556a411b5988bc46867dbb99fd@tonotdo.com> <16d1f96d86592f9e5511b61a678e2f81@tonotdo.com> <87y4a8m9b2.fsf@gnus.org> <0C474D0B-86AF-4030-B4B4-87E8CBEC4A67@iotcl.com> <87d1rilrxu.fsf@gnus.org> <9D6D35E4-B589-4E47-8939-7D682F93AE74@iotcl.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="185902"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Toon Claes , Toon Claes , 11865@debbugs.gnu.org To: Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jun 27 17:11:59 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hgW47-000m8u-6K for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Jun 2019 17:11:59 +0200 Original-Received: from localhost ([::1]:51618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgW42-0001G9-Gr for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Jun 2019 11:11:58 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57715) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgW3Y-0001Dn-3L for bug-gnu-emacs@gnu.org; Thu, 27 Jun 2019 11:11:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgW3T-0002C6-Qx for bug-gnu-emacs@gnu.org; Thu, 27 Jun 2019 11:11:22 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hgW3D-00021V-Ke; Thu, 27 Jun 2019 11:11:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hgW3B-00084T-TQ; Thu, 27 Jun 2019 11:11:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Thu, 27 Jun 2019 15:11:01 +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: patch Original-Received: via spool by 11865-submit@debbugs.gnu.org id=B11865.156164821530951 (code B ref 11865); Thu, 27 Jun 2019 15:11:01 +0000 Original-Received: (at 11865) by debbugs.gnu.org; 27 Jun 2019 15:10:15 +0000 Original-Received: from localhost ([127.0.0.1]:39233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hgW2O-000835-Pg for submit@debbugs.gnu.org; Thu, 27 Jun 2019 11:10:14 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:43672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hgW2M-00082s-5V for 11865@debbugs.gnu.org; Thu, 27 Jun 2019 11:10:11 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=stories) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hgW2H-0006tu-IC; Thu, 27 Jun 2019 17:10:08 +0200 In-Reply-To: <9D6D35E4-B589-4E47-8939-7D682F93AE74@iotcl.com> (Toon Claes's message of "Thu, 10 Mar 2016 09:58:56 +0100") 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: 209.51.188.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" Xref: news.gmane.org gmane.emacs.bugs:161597 Archived-At: Toon Claes writes: > Hi Lars, > > Find the patch attached. > The regexp is written to match: > /** gtkdoc */ > /** > * gtkdoc > */ > > And to not match: > /*******/ Alan, can you comment on this patch? It's about not recognising gtkdoc comments in c++-mode: > * progmodes/cc-vars.el (c-doc-comment-style): Set gtkdoc the > default for c++-mode. > * progmodes/cc-fonts.el (gtkdoc-font-lock-keywords): Text inside > GtkDoc comment can be on the same line as the comment start "/**". > --- > ChangeLog.2 | 9 +++++++++ > lisp/progmodes/cc-fonts.el | 2 +- > lisp/progmodes/cc-vars.el | 5 +++-- > 3 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/ChangeLog.2 b/ChangeLog.2 > index 5253a92..7ba1872 100644 > --- a/ChangeLog.2 > +++ b/ChangeLog.2 > @@ -1,3 +1,12 @@ > +2016-03-10 Toon Claes > + > + Fix Bug#11865 > + > + * progmodes/cc-vars.el (c-doc-comment-style): Set gtkdoc the > + default for c++-mode. > + * progmodes/cc-fonts.el (gtkdoc-font-lock-keywords): Text inside > + GtkDoc comment can be on the same line as the comment start "/**". > + > 2016-03-04 Michael Albinus > > Fix Bug#22859 > diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el > index a7097b9..6bbb8f4 100644 > --- a/lisp/progmodes/cc-fonts.el > +++ b/lisp/progmodes/cc-fonts.el > @@ -2515,7 +2515,7 @@ need for `pike-font-lock-extra-types'.") > > (defconst gtkdoc-font-lock-keywords > `((,(lambda (limit) > - (c-font-lock-doc-comments "/\\*\\*$" limit > + (c-font-lock-doc-comments "/\\*\\*\\([^\\*].*\\)?$" limit > gtkdoc-font-lock-doc-comments) > (c-font-lock-doc-comments "/\\*< " limit > gtkdoc-font-lock-doc-protection) > diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el > index a695718..9783516 100644 > --- a/lisp/progmodes/cc-vars.el > +++ b/lisp/progmodes/cc-vars.el > @@ -550,7 +550,8 @@ variable in a mode hook." > (defcustom-c-stylevar c-doc-comment-style > '((java-mode . javadoc) > (pike-mode . autodoc) > - (c-mode . gtkdoc)) > + (c-mode . gtkdoc) > + (c++-mode . gtkdoc)) > "*Specifies documentation comment style(s) to recognize. > This is primarily used to fontify doc comments and the markup within > them, e.g. Javadoc comments. > @@ -560,7 +561,7 @@ comment styles: > > javadoc -- Javadoc style for \"/** ... */\" comments (default in Java mode). > autodoc -- Pike autodoc style for \"//! ...\" comments (default in Pike mode). > - gtkdoc -- GtkDoc style for \"/** ... **/\" comments (default in C mode). > + gtkdoc -- GtkDoc style for \"/** ... **/\" comments (default in C/C++ mode). > > The value may also be a list of doc comment styles, in which case all > of them are recognized simultaneously (presumably with markup cues -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no