Merge ack master from github.com:leoliu/ack-el

[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 287bad48e9bc3bae0190eb0a705b4f1b9b4b6e36..ff62610ae894c6826ca584f324376792951080ed 100644 (file)
--- a/packages/ada-mode/gnat-core.el
+++ b/packages/ada-mode/gnat-core.el
@@ -1,9 +1,9 @@
-;; Support for running GNAT tools, which support multiple programming
+;; gnat-core.el --- Support for running GNAT tools, which support multiple programming  -*- lexical-binding:t -*-
 ;; languages.
 ;;
 ;; 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>
@@ -345,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'."
@@ -391,9 +396,8 @@ list."
 
 (defun ada-gnat-ada-name-from-file-name (file-name)
   "For `ada-ada-name-from-file-name'."
-  (let* (status
-        (ada-name (file-name-sans-extension (file-name-nondirectory file-name)))
-       (predefined (cdr (assoc ada-name ada-gnat-predefined-package-alist))))
+  (let* ((ada-name (file-name-sans-extension (file-name-nondirectory file-name)))
+         (predefined (cdr (assoc ada-name ada-gnat-predefined-package-alist))))
 
     (if predefined
         predefined