bug#681: Wrong C++ indentation in batch mode

[Vivien Mallet <Vivien.Mallet@inria.fr>]

[-- Attachment #1: Type: text/plain, Size: 1701 bytes --]

	Hello,

	The indentation in C++ mode does not seem to work properly in batch mode with 
the following code (indented in interactive mode):
"""
template <class A, class B>
Derived<A, B>::Derived():
  Base<A,
       B>() // Problem: wrong indentation in batch mode.
{
}
"""

	Now, define the Lisp function:
(defun cpp_indent ()
  (c-set-style "gnu")
  (c++-mode)
  (indent-region (point-min) (point-max) ())
  (save-buffer)
  )
	And apply it the previous function. It will result in:
"""
template <class A, class B>
Derived<A, B>::Derived():
  Base<A,
  B>() // Problem: wrong indentation in batch mode.
{
}
"""
	which is inconsistent with the interactive and is not, I presume, the 
targeted result.
	I found the problem in Emacs 23.0.60.1 (emacs snapshot in Kubuntu 8.04) and 
in Emacs 22.1.3. It does not appear in Emacs 21.4.1 (Debian Etch).


	Just an unrelated note about the indentation. I found a difference between the 
two latest versions I mentioned and the version 21.4.1. This code (indented 
with Emacs 22+):
"""
template <class A, class B>
Derived0<A, B>::Derived0():
  Base<A, B>
  ()
{
}
"""
	is indented by Emacs 21.4.1 as
"""
template <class A, class B>
Derived0<A, B>::Derived0():
  Base<A, B>
()
{
}
"""
	I like the new indentation better, and I suppose it was an improvement 
introduced in the latest versions. I mention it, just in case...


	I attach three files:
- test.cxx: a file to be indented (but already well indented);
- test-wrong_indentation.cxx: test.cxx after indentation in batch mode with 
Emacs 22+;
- cpp_indent.lisp: the indentation function. Used in: "emacs -batch test.cxx -
l cpp_indent.lisp -f cpp_indent".


	Thank you for your great work,
	Vivien Mallet.

[-- Attachment #2: test-wrong_indentation.cxx --]
[-- Type: text/x-c++src, Size: 251 bytes --]

template <class A, class B>
Derived<A, B>::Derived():
  Base<A,
  B>() // Problem: wrong indentation in batch mode.
{
}


template <class A, class B>
Derived0<A, B>::Derived0():
  Base<A, B>
  () // Just a note: Emacs 21 did not indent like that.
{
}

[-- Attachment #3: test.cxx --]
[-- Type: text/x-c++src, Size: 256 bytes --]

template <class A, class B>
Derived<A, B>::Derived():
  Base<A,
       B>() // Problem: wrong indentation in batch mode.
{
}


template <class A, class B>
Derived0<A, B>::Derived0():
  Base<A, B>
  () // Just a note: Emacs 21 did not indent like that.
{
}

[-- Attachment #4: cpp_indent.lisp --]
[-- Type: text/plain, Size: 121 bytes --]

(defun cpp_indent ()
  (c-set-style "gnu")
  (c++-mode)
  (indent-region (point-min) (point-max) ())
  (save-buffer)
  )