remove bogus execute priv

[gnu-emacs-elpa] / packages / ada-mode / ada-wisi.el

diff --git a/packages/ada-mode/ada-wisi.el b/packages/ada-mode/ada-wisi.el
old mode 100755 (executable)
new mode 100644 (file)
index bb57492..d86e93a
--- a/packages/ada-mode/ada-wisi.el
+++ b/packages/ada-mode/ada-wisi.el
@@ -297,7 +297,7 @@ point must be on CACHE. PREV-TOKEN is the token before the one being indented."
 
        (name
         (cl-case (wisi-cache-nonterm cache)
-          ((procedure_specification subprogram_specification)
+          ((function_specification procedure_specification)
            ;; test/ada_mode-nominal.ads
            ;; not
            ;; overriding
@@ -1002,12 +1002,6 @@ cached token, return new indentation for point."
            ;;        1 =>
            (+ (current-column) 1))
 
-          (OF
-           ;; ada_mode-nominal.ads
-           ;; Anon_Array_2 : array (1 .. 10) of
-           ;;   Integer;
-           (ada-wisi-indent-containing ada-indent-broken cache))
-
           (NEW
            ;; ada_mode-nominal.ads
            ;; type Limited_Derived_Type_2 is abstract limited new Private_Type_1 with
@@ -1019,6 +1013,12 @@ cached token, return new indentation for point."
            ;; indenting 'Instance'; containing is 'new'
            (ada-wisi-indent-containing ada-indent-broken cache))
 
+          (OF
+           ;; ada_mode-nominal.ads
+           ;; Anon_Array_2 : array (1 .. 10) of
+           ;;   Integer;
+           (ada-wisi-indent-containing ada-indent-broken cache))
+
           (WHEN
            ;; test/ada_mode-parens.adb
            ;; exit when A.all
@@ -1041,12 +1041,6 @@ cached token, return new indentation for point."
               ;;   Constant_Indexing => Constant_Reference,
               ;; indenting 'Constant_Indexing'; point is on 'with'
               (+ (current-indentation) ada-indent-broken))
-
-             (raise_statement
-              ;; raise_statement: test/ada_mode-nominal.adb
-              ;; raise Constraint_Error with
-              ;;    "help!";
-              (ada-wisi-indent-containing ada-indent-broken cache nil))
              ))
 
           ;; otherwise just hanging
@@ -1076,7 +1070,7 @@ cached token, return new indentation for point."
     ))
 
 (defun ada-wisi-comment ()
-  "Compute indentation of a comment. For `wisi-indent-functions'."
+  "Compute indentation of a comment. For `wisi-indent-calculate-functions'."
   ;; We know we are at the first token on a line. We check for comment
   ;; syntax, not comment-start, to accomodate gnatprep, skeleton
   ;; placeholders, etc.
@@ -1191,6 +1185,12 @@ Also return cache at start."
        )
     cache))
 
+(defun ada-wisi-goto-declaration-end ()
+  "For `ada-goto-declaration-end', which see."
+  ;; first goto-declaration-start, so we get the right end, not just
+  ;; the current statement end.
+  (wisi-goto-end-1 (ada-wisi-goto-declaration-start)))
+
 (defun ada-wisi-goto-declarative-region-start ()
   "For `ada-goto-declarative-region-start', which see."
   (wisi-validate-cache (point))
@@ -1521,6 +1521,7 @@ Also return cache at start."
 
 (setq ada-fix-context-clause 'ada-wisi-context-clause)
 (setq ada-goto-declaration-start 'ada-wisi-goto-declaration-start)
+(setq ada-goto-declaration-end 'ada-wisi-goto-declaration-end)
 (setq ada-goto-declarative-region-start 'ada-wisi-goto-declarative-region-start)
 (setq ada-goto-end 'wisi-goto-end)
 (setq ada-in-paramlist-p 'ada-wisi-in-paramlist-p)