Subject: bug#8438: 24.0.50; C++ macro make indentation fail

From: Chong Yidong <[email-masked]>
Date: Sun, 24 Apr 2011 14:13:16 -0400

Daniel Colascione <[email-masked]> writes:

> The problem actually has nothing to do with the macro:
> c-forward-decl-or-cast-1 is choking on the const because it's mistaking
> it for something that might be part of a member function pointer.
> Because c-forward-decl-or-cast-1 fails inside
> c-just-after-func-arglist-p, c-guess-basic-offset tries the next best
> thing, which happens to be a template argument continuation.
>
> The attached patch resolves the issue.

Looks OK to me.  Please check if the same fix is required on the
emacs-23 branch, and if so commit it there.