update ada-mode, wisi

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

diff --git a/packages/ada-mode/gnat-core.el b/packages/ada-mode/gnat-core.el
index a9d79ea8b22e0f6e6d3c8b05cc4a274c54ba1f1a..72d2d48e9a4c0c846fb554dd9d116a6d02f445f2 100644 (file)
--- a/packages/ada-mode/gnat-core.el
+++ b/packages/ada-mode/gnat-core.el
@@ -3,7 +3,7 @@
 ;;
 ;; GNAT is provided by AdaCore; see http://libre.adacore.com/
 ;;
-;;; Copyright (C) 2012 - 2014  Free Software Foundation, Inc.
+;;; Copyright (C) 2012 - 2015  Free Software Foundation, Inc.
 ;;
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
 ;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
@@ -128,14 +128,14 @@ Uses 'gnat list'.  Returns new (SRC-DIRS PRJ-DIRS)."
          (forward-line 1)
          (while (not (looking-at "^$")) ; terminate on blank line
            (back-to-indentation) ; skip whitespace forward
-            (cl-pushnew (if (looking-at "<Current_Directory>")
-                             (directory-file-name default-directory)
-                           (expand-file-name ; Canonicalize path part.
-                           (directory-file-name
-                            (buffer-substring-no-properties
-                              (point) (point-at-eol)))))
-                        src-dirs
-                        :test #'equal)
+            (cl-pushnew
+            (if (looking-at "<Current_Directory>")
+                (directory-file-name default-directory)
+              (expand-file-name ; Canonicalize path part.
+               (directory-file-name
+                (buffer-substring-no-properties (point) (point-at-eol)))))
+            src-dirs
+            :test #'equal)
            (forward-line 1))
 
          ;; Project path
@@ -149,8 +149,7 @@ Uses 'gnat list'.  Returns new (SRC-DIRS PRJ-DIRS)."
            (if (looking-at "<Current_Directory>")
                 (cl-pushnew "." prj-dirs :test #'equal)
               (let ((f (expand-file-name
-                        (buffer-substring-no-properties
-                         (point) (point-at-eol)))))
+                        (buffer-substring-no-properties (point) (point-at-eol)))))
                 (cl-pushnew f prj-dirs :test #'equal)
                 (cl-pushnew f src-dirs :test #'equal)))
            (forward-line 1))
@@ -173,7 +172,7 @@ Uses 'gnat list'.  Returns new (SRC-DIRS PRJ-DIRS)."
     ;; known".
     ;; Using 'require' at top level gives the wrong default ada-xref-tool
     (cl-ecase (ada-prj-get 'xref_tool project)
-      ((gnat gnat_inspect)
+      (gnat
        (let ((res (gnat-get-paths-1 src-dirs prj-dirs)))
         (setq src-dirs (car res))
         (setq prj-dirs (cadr res))))
@@ -346,6 +345,11 @@ list."
        )
       )))
 
+(defun gnatprep-setup ()
+  (when (boundp 'wisi-indent-calculate-functions)
+    (add-to-list 'wisi-indent-calculate-functions 'gnatprep-indent))
+  )
+
 ;;;; support for xref tools
 (defun ada-gnat-file-name-from-ada-name (ada-name)
   "For `ada-file-name-from-ada-name'."