bug#5400: 23.1; ada-mode; null procedure confuses indentation

[Stephen Leake]

Package: ada-mode

After entering the following code:

procedure Label_Test is
   Foo : A_Type;

   procedure Test1 is null;

   procedure Test2 is null;

begin
   null;
end Label_Test;

hitting <return> after the final ; gives an erroneous error message:

ada-check-defun-name: Matching defun has different name: 

due to the presense of the null procedure declarations.


In GNU Emacs 23.1.1 (i486-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2009-08-02 on raven, modified by Debian
Windowing system distributor `The Cygwin/X Project', version 11.0.10703000
configured using `configure  '--build=i486-linux-gnu' '--host=i486-linux-gnu' 
'--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' 
'--localstatedir=/var/lib' '--infodir=/usr/share/info' 
'--mandir=/usr/share/man' '--with-pop=yes' 
'--enable-locallisppath=/etc/emacs23:/etc/emacs:/usr/local/share/emacs/23.1/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.1/site-lisp:/usr/share/emacs/site-lisp:/usr/share/emacs/23.1/leim'
 '--with-x=yes' '--with-x-toolkit=athena' '--with-toolkit-scroll-bars' 
'build_alias=i486-linux-gnu' 'host_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -g 
-O2' 'LDFLAGS=-g' 'CPPFLAGS=''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_US.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default-enable-multibyte-characters: t

Major mode: Ada

Minor modes in effect:
  tooltip-mode: t
  tool-bar-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  global-auto-composition-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> l 
<tab> <tab> <tab> <return> <help-echo> C-x C-f / h 
o m e / P r o <tab> e m a <tab> - <backspace> _ s t 
<tab> e m <tab> _ <tab> a d <backspace> <backspace> 
t e s t <tab> t e s t _ g o o <backspace> <tab> <return> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <tab> <up> <tab> 
<up> <up> <tab> <up> <up> <tab> <down> <down> <down> 
<S-left> <S-left> <S-right> <S-right> <backspace> <backspace> 
<backspace> w h e n <down> <tab> <down> <tab> <down> 
<tab> M-w C-x C-s M-d C-/ <help-echo> <help-echo> <help-echo> 
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo> 
<help-echo> <tool-bar> <kill-buffer> <help-echo> <help-echo> 
<help-echo> <help-echo> <help-echo> C-x C-f ~ / l a 
b <tab> <return> y e s C-g <f11> C-x b l a b <tab> 
<return> <left> <left> <S-up> <S-up> <S-up> <S-up> 
<S-up> <S-up> <S-up> <S-up> <S-up> <S-up> <S-left> 
<S-up> <delete> y M-w <S-up> <down> <down> <down> <up> 
<up> <S-down> <S-down> <S-down> <S-down> <S-down> <S-down> 
<S-down> <S-down> <S-down> <S-down> <S-down> <backspace> 
<S-up> <S-up> <S-up> <S-up> <S-up> <S-up> <S-up> <S-up> 
<S-up> <S-up> <S-up> <S-right> <S-right> <S-right> 
<help-echo> <tool-bar> <cut> <help-echo> <delete> <up> 
<up> <up> <up> <up> <up> <up> <up> <up> <up> <up> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<help-echo> <return> c M-x <help-echo> r e b o <backspace> 
<backspace> p <tab> o <tab> r <tab> <return>

Recent messages:
Wrote 
/home/Projects/emacs_stephe.main/emacs_stephe_site_lisp/test/test_goto_decl_start.adb
Undo!
Quit
Mark set
label_test.adb changed on disk; really edit the buffer? (y, n, r or C-h) 
File on disk now will become a backup file if you save these changes.
Mark set [3 times]
Continue...
ada-check-defun-name: Matching defun has different name: Test2
Making completion list... [2 times]