f90 mode indent with Emacs 22.0.50.1

[Eric_Salathe]

I'm finding a different behavior for indents in f90 mode with version
22.0.50.1 than earlier versions (eg 21.2 21.4).

In f90.el, the code

(defcustom f90-program-indent 2
  "*Extra indentation applied to PROGRAM, MODULE, SUBROUTINE, FUNCTION
blocks."
  :type  'integer
  :group 'f90-indent)

should cause a line "program my_great_model" to start in column 1 and
all following lines to be indented 2 columns except the final "end
program my_great_model", which is in column 1 again. This is the
behavior in 21.4.1 and 21.2.1 on both OS X and GNU/Linux.

However, I have installed 22.0.50.1 from CVS on OS X due to the carbon
support in that version. In this version, the "program" and "end
program" lines gets indented 2 columns and the body of the program is
indented another 2, for 4 total. This is not the proper behavior. I can
work around it by not indenting the program line and avoiding the
"Indent Subprogram" command, but that is less than ideal.

Is this a known problem? Is there an easy way to fix it?

-Eric
salathe <at> washington <dot> edu