# HG changeset patch
# Parent 2f1bf062731aea48e6ef5391ba41f18b14fb2b5a
Handle 'not null access' differently from 'not null'.

  * ada-mode.el (ada-insert-paramlist-multi-line): new variable
    not-null-access-p, set not-nil if any line in the parameter list
    has 'not null access'.
    Reserves 18 columns for 'not null access', 11 for 'not null' alone.

diff -r 2f1bf062731a ada-mode.el
--- a/ada-mode.el	Tue Aug 12 16:30:02 2014 +0100
+++ b/ada-mode.el	Wed Sep 10 21:10:40 2014 +0100
@@ -648,6 +648,7 @@
 	(type-len 0)
 	(in-p nil)
 	(out-p nil)
+        (not-null-access-p nil)
 	(not-null-p nil)
 	(access-p nil)
 	ident-col
@@ -683,6 +684,8 @@
 
       (setq in-p (or in-p (nth 1 param)))
       (setq out-p (or out-p (nth 2 param)))
+      (setq not-null-access-p
+            (or not-null-access-p (and (nth 3 param) (nth 4 param))))
       (setq not-null-p (or not-null-p (nth 3 param)))
       (setq access-p (or access-p (nth 4 param)))
       )
@@ -711,8 +714,9 @@
     (setq type-col
 	  (+ colon-col
 	     (cond
-	      (not-null-p 18);    ": not null access "
-	      (access-p 9);        ": access"
+	      (not-null-access-p 18); ": not null access "
+              (not-null-p 11);       ": not null "
+	      (access-p 9);        ": access "
 	      ((and in-p out-p) 9); ": in out "
 	      (out-p 6);           ": out "
 	      (in-p 5);            ": in "