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: Wed, 05 Jun 2013 10:24:56 +0200 Message-ID: <16d1f96d86592f9e5511b61a678e2f81@tonotdo.com> References: <5a95c7556a411b5988bc46867dbb99fd@tonotdo.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1370420782 21279 80.91.229.3 (5 Jun 2013 08:26:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 5 Jun 2013 08:26:22 +0000 (UTC) To: <11865@debbugs.gnu.org> Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 05 10:26:23 2013 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 1Uk930-0001vh-Lr for geb-bug-gnu-emacs@m.gmane.org; Wed, 05 Jun 2013 10:26:22 +0200 Original-Received: from localhost ([::1]:37771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uk930-00056m-8x for geb-bug-gnu-emacs@m.gmane.org; Wed, 05 Jun 2013 04:26:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uk92q-00056d-L6 for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2013 04:26:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uk92k-0007G7-H3 for bug-gnu-emacs@gnu.org; Wed, 05 Jun 2013 04:26:12 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uk92d-0007Di-GQ; Wed, 05 Jun 2013 04:25:59 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Uk94b-0001K7-Iq; Wed, 05 Jun 2013 04:28:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <5a95c7556a411b5988bc46867dbb99fd@tonotdo.com> Resent-From: Toon Claes Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Wed, 05 Jun 2013 08:28: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: Original-Received: via spool by 11865-submit@debbugs.gnu.org id=B11865.13704208314899 (code B ref 11865); Wed, 05 Jun 2013 08:28:01 +0000 Original-Received: (at 11865) by debbugs.gnu.org; 5 Jun 2013 08:27:11 +0000 Original-Received: from localhost ([127.0.0.1]:51619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Uk93k-0001Gd-Cv for submit@debbugs.gnu.org; Wed, 05 Jun 2013 04:27:10 -0400 Original-Received: from web1.futureweb.be ([77.243.237.194]:52660) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Uk93g-0001FB-PJ for 11865@debbugs.gnu.org; Wed, 05 Jun 2013 04:27:06 -0400 Original-Received: from localhost ([127.0.0.1] helo=tonotdo.com) by web1.futureweb.be with esmtpa (Exim 4.80.1) (envelope-from ) id 1Uk91c-00069J-Ae for 11865@debbugs.gnu.org; Wed, 05 Jun 2013 10:24:56 +0200 X-Sender: toon@tonotdo.com User-Agent: Roundcube Webmail/0.8.6 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.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:74814 Archived-At: Tags: patch Resubmitting my patch (with correct "Tags: patch" this time) in hope it finally gets merged. --- === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-06 07:08:10 +0000 +++ lisp/ChangeLog 2012-07-06 13:48:51 +0000 @@ -1,3 +1,11 @@ +2012-07-06 Toon Claes + + * progmodes/cc-fonts.el (gtkdoc-font-lock-keywords): Better gtkdoc + parsing. + + * progmodes/cc-vars.el (c-doc-comment-style): Use gtkdoc as default + for C++. + 2012-07-06 Glenn Morris * Makefile.in (compile-one-process): Rename from "recompile". === modified file 'lisp/progmodes/cc-fonts.el' --- lisp/progmodes/cc-fonts.el 2012-01-19 07:21:25 +0000 +++ lisp/progmodes/cc-fonts.el 2012-07-06 13:49:00 +0000 @@ -2572,7 +2572,7 @@ (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) === modified file 'lisp/progmodes/cc-vars.el' --- lisp/progmodes/cc-vars.el 2012-02-11 22:13:29 +0000 +++ lisp/progmodes/cc-vars.el 2012-07-06 13:48:46 +0000 @@ -552,7 +552,8 @@ (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. @@ -562,7 +563,7 @@ 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