[Emacs-diffs] /srv/bzr/emacs/trunk r99400: Fix bug#5435: ada-mode; pragma parameter list indented incorrectly.

[Juanma Barranquero]

------------------------------------------------------------
revno: 99400 [merge]
author: Stephen Leake <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-23 13:42:22 +0100
message:
  Fix bug#5435: ada-mode; pragma parameter list indented incorrectly.
modified:
  lisp/ChangeLog
  lisp/progmodes/ada-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-23 11:02:28 +0000
+++ b/lisp/ChangeLog    2010-01-23 12:42:22 +0000
@@ -1,3 +1,8 @@
+2010-01-23  Stephen Leake  <address@hidden>
+
+        * progmodes/ada-mode.el (ada-in-paramlist-p): Pragma syntax
+       is the same as subprogram call, not declaration.  (Bug#5435).
+
 2010-01-23  Michael Albinus  <address@hidden>
 
        * net/tramp-smb.el (tramp-smb-conf): New defcustom.

=== modified file 'lisp/progmodes/ada-mode.el'
--- a/lisp/progmodes/ada-mode.el        2010-01-18 23:10:57 +0000
+++ b/lisp/progmodes/ada-mode.el        2010-01-23 12:34:52 +0000
@@ -257,7 +257,7 @@
 
 For instance:
     A := 1;   --  A multi-line comment
-             --  aligned if ada-indent-align-comments is t"
+             --  aligned if `ada-indent-align-comments' is t"
   :type 'boolean :group 'ada)
 
 (defcustom ada-indent-comment-as-code t
@@ -4163,7 +4163,7 @@
 
 
 (defun ada-in-paramlist-p ()
-  "Return t if point is inside a parameter-list."
+  "Return t if point is inside the parameter-list of a declaration, but not a 
subprogram call or aggregate."
   (save-excursion
     (and
      (ada-search-ignore-string-comment "(\\|)" t nil t)
@@ -4194,13 +4194,13 @@
 
      ;; right keyword two words before parenthesis ?
      ;; Type is in this list because of discriminants
+     ;; pragma is not, because the syntax is that of a subprogram call.
      (looking-at (eval-when-compile
                   (concat "\\<\\("
                           "procedure\\|function\\|body\\|"
                           "task\\|entry\\|accept\\|"
                           "access[ \t]+procedure\\|"
                           "access[ \t]+function\\|"
-                          "pragma\\|"
                           "type\\)\\>"))))))
 
 (defun ada-search-ignore-complex-boolean (regexp backwardp)