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: Fri, 06 Jul 2012 16:00:17 +0200 Message-ID: References: <5a95c7556a411b5988bc46867dbb99fd@tonotdo.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="=_9548d4f8a0de92fe9a4faefdd9317040" X-Trace: dough.gmane.org 1341583292 17873 80.91.229.3 (6 Jul 2012 14:01:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 6 Jul 2012 14:01:32 +0000 (UTC) To: <11865@debbugs.gnu.org> Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jul 06 16:01:30 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 1Sn969-0003eo-ES for geb-bug-gnu-emacs@m.gmane.org; Fri, 06 Jul 2012 16:01:29 +0200 Original-Received: from localhost ([::1]:36342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn968-0006AB-F0 for geb-bug-gnu-emacs@m.gmane.org; Fri, 06 Jul 2012 10:01:28 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn960-00069u-A9 for bug-gnu-emacs@gnu.org; Fri, 06 Jul 2012 10:01:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sn95t-00016J-Ro for bug-gnu-emacs@gnu.org; Fri, 06 Jul 2012 10:01:19 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43307) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn95j-00014x-Qr; Fri, 06 Jul 2012 10:01:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Sn9AX-0005zl-Gy; Fri, 06 Jul 2012 10:06: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: Fri, 06 Jul 2012 14:06: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.134158352122998 (code B ref 11865); Fri, 06 Jul 2012 14:06:01 +0000 Original-Received: (at 11865) by debbugs.gnu.org; 6 Jul 2012 14:05:21 +0000 Original-Received: from localhost ([127.0.0.1]:52849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sn99s-0005ys-Pr for submit@debbugs.gnu.org; Fri, 06 Jul 2012 10:05:21 -0400 Original-Received: from web1.futureweb.be ([77.243.237.194]:60030) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sn99p-0005yg-EJ for 11865@debbugs.gnu.org; Fri, 06 Jul 2012 10:05:19 -0400 Original-Received: from localhost ([127.0.0.1] helo=tonotdo.com) by web1.futureweb.be with esmtpa (Exim 4.80) (envelope-from ) id 1Sn950-0001zz-16 for 11865@debbugs.gnu.org; Fri, 06 Jul 2012 16:00:18 +0200 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:61646 Archived-At: --=_9548d4f8a0de92fe9a4faefdd9317040 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 I think I've found the solution. Please consider this patch: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-06 13:50:37 +0000 +++ lisp/ChangeLog 2012-07-06 07:08:10 +0000 @@ -1,11 +1,3 @@ -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-07-06 13:50:37 +0000 +++ lisp/progmodes/cc-fonts.el 2012-01-19 07:21:25 +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-07-06 13:50:37 +0000 +++ lisp/progmodes/cc-vars.el 2012-02-11 22:13:29 +0000 @@ -552,8 +552,7 @@ (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. @@ -563,7 +562,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/C++ mode). + gtkdoc -- GtkDoc style for "/** ... **/" comments (default in 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 --=_9548d4f8a0de92fe9a4faefdd9317040 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=UTF-8

I think I've found the solution. Please consider this patch:

=3D=3D=3D modified file 'lisp/ChangeLog'
--- lisp/ChangeLog &n= bsp;  2012-07-06 13:50:37 +0000
+++ lisp/ChangeLog   &n= bsp;2012-07-06 07:08:10 +0000
@@ -1,11 +1,3 @@
-2012-07-06  = Toon Claes  <toon@tonotdo.com>
-
-    *= progmodes/cc-fonts.el (gtkdoc-font-lock-keywords):
-   &nbs= p;Less restrictive checking for gtkdoc.
-
-    * p= rogmodes/cc-vars.el: For c++-mode set gtkdoc the default
-  =  c-doc-comment-style.
-
 2012-07-06  Glenn Morris=   <rgm@gnu.org>
 
     * Make= file.in (compile-one-process): Rename from "recompile".

=3D=3D= =3D modified file 'lisp/progmodes/cc-fonts.el'
--- lisp/progmodes/cc-f= onts.el    2012-07-06 13:50:37 +0000
+++ lisp/progmodes= /cc-fonts.el    2012-01-19 07:21:25 +0000
@@ -2572,7 +2= 572,7 @@
 
 (defconst gtkdoc-font-lock-keywords
&n= bsp;  `((,(lambda (limit)
-    (c-font-lock-doc-co= mments "/\\*\\*\\([^\\*/].*\\)?$" limit
+    (c-font-lo= ck-doc-comments "/\\*\\*$" limit
       gtkdo= c-font-lock-doc-comments)
     (c-font-lock-doc-co= mments "/\\*< " limit
       gtkdoc-font-l= ock-doc-protection)

=3D=3D=3D modified file 'lisp/progmodes/cc-v= ars.el'
--- lisp/progmodes/cc-vars.el    2012-07-06 13:= 50:37 +0000
+++ lisp/progmodes/cc-vars.el    2012-02-11= 22:13:29 +0000
@@ -552,8 +552,7 @@
 (defcustom-c-stylevar c= -doc-comment-style
   '((java-mode . javadoc)
 &nb= sp;   (pike-mode . autodoc)
-    (c-mode = ;   . gtkdoc)
-    (c++-mode  . gtkdoc))=
+    (c-mode    . gtkdoc))
 &= nbsp; "*Specifies documentation comment style(s) to recognize.
 T= his is primarily used to fontify doc comments and the markup within
&n= bsp;them, e.g. Javadoc comments.
@@ -563,7 +562,7 @@
 
=   javadoc -- Javadoc style for \"/** ... */\" comments (default in Jav= a mode).
  autodoc -- Pike autodoc style for \"//! ...\" comments= (default in Pike mode).
- gtkdoc  -- GtkDoc style for \"/** ..= =2E **/\" comments (default in C/C++ mode).
+ gtkdoc  -- GtkDoc s= tyle for \"/** ... **/\" comments (default in C mode).
 
&nb= sp;The value may also be a list of doc comment styles, in which case all of them are recognized simultaneously (presumably with markup cues=


 
--=_9548d4f8a0de92fe9a4faefdd9317040--