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: 24.1.50; doxygen comments not highlighted in c++-mode Date: Tue, 10 Jul 2012 08:59:24 +0200 Message-ID: <81f18f30cc17d41a72b8c0e6e77a1ee7@tonotdo.com> References: 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: dough.gmane.org 1341903610 24548 80.91.229.3 (10 Jul 2012 07:00:10 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 10 Jul 2012 07:00:10 +0000 (UTC) Cc: toon@tonotdo.com To: <11865@debbugs.gnu.org> Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jul 10 09:00:08 2012 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 1SoUQY-0002Dr-2w for geb-bug-gnu-emacs@m.gmane.org; Tue, 10 Jul 2012 09:00:06 +0200 Original-Received: from localhost ([::1]:41292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoUQX-00062b-6E for geb-bug-gnu-emacs@m.gmane.org; Tue, 10 Jul 2012 03:00:05 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoUQP-00060P-DO for bug-gnu-emacs@gnu.org; Tue, 10 Jul 2012 03:00:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoUQJ-0003Nu-7A for bug-gnu-emacs@gnu.org; Tue, 10 Jul 2012 02:59:56 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoUQB-0003MI-OS; Tue, 10 Jul 2012 02:59:43 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SoUVK-00030Q-4W; Tue, 10 Jul 2012 03:05:02 -0400 X-Loop: help-debbugs@gnu.org 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: Tue, 10 Jul 2012 07:05:02 +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.134190389111538 (code B ref 11865); Tue, 10 Jul 2012 07:05:02 +0000 Original-Received: (at 11865) by debbugs.gnu.org; 10 Jul 2012 07:04:51 +0000 Original-Received: from localhost ([127.0.0.1]:59110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SoUV7-000301-G5 for submit@debbugs.gnu.org; Tue, 10 Jul 2012 03:04:51 -0400 Original-Received: from web1.futureweb.be ([77.243.237.194]:60528) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SoUV3-0002zs-Kn for 11865@debbugs.gnu.org; Tue, 10 Jul 2012 03:04:47 -0400 Original-Received: from localhost ([127.0.0.1] helo=tonotdo.com) by web1.futureweb.be with esmtpa (Exim 4.80) (envelope-from ) id 1SoUPs-0001yD-I1; Tue, 10 Jul 2012 08:59:24 +0200 In-Reply-To: X-Sender: toon@tonotdo.com User-Agent: Roundcube Webmail/0.7.2 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 (newer, 2) 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:61783 Archived-At: Excuse me, previous patch was incorrect. This one should be better --- === 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): + Less restrictive checking for gtkdoc. + + * progmodes/cc-vars.el: For c++-mode set gtkdoc the default + c-doc-comment-style. + 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