branch: master commit 3398490f336a20d9645efebb71c3cb24d703f32a Author: Stephen Leake <stephen_le...@stephe-leake.org> Commit: Stephen Leake <stephen_le...@stephe-leake.org>
Release ada-mode bug-fix version 7.1.2 * packages/ada-mode/ada-mode.el: Bump version to 7.1.2. * packages/ada-mode/ada.wy (expression_function_declaration): Revert change in indent of 'is' to 7.0.1 behavior. * packages/ada-mode/ada_process_actions.adb: (expression_function_declaration_0): Update. --- packages/ada-mode/ada-mode.el | 4 ++-- packages/ada-mode/ada.wy | 2 +- packages/ada-mode/ada_process_actions.adb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ada-mode/ada-mode.el b/packages/ada-mode/ada-mode.el index e63f7f6..bdf74ef 100644 --- a/packages/ada-mode/ada-mode.el +++ b/packages/ada-mode/ada-mode.el @@ -6,7 +6,7 @@ ;; Maintainer: Stephen Leake <stephen_le...@stephe-leake.org> ;; Keywords: languages ;; ada -;; Version: 7.1.1 +;; Version: 7.1.2 ;; package-requires: ((uniquify-files "1.0.1") (wisi "3.1.1") (emacs "25.0")) ;; url: http://www.nongnu.org/ada-mode/ ;; @@ -117,7 +117,7 @@ (defun ada-mode-version () "Return Ada mode version." (interactive) - (let ((version-string "7.1.0")) + (let ((version-string "7.1.2")) (if (called-interactively-p 'interactive) (message version-string) version-string))) diff --git a/packages/ada-mode/ada.wy b/packages/ada-mode/ada.wy index d50b89e..436d799 100644 --- a/packages/ada-mode/ada.wy +++ b/packages/ada-mode/ada.wy @@ -1078,7 +1078,7 @@ expression_function_declaration ;; IS does not start a block, so it is not "motion". ;; %((wisi-statement-action [1 statement-start 2 statement-override 6 statement-end]) - (wisi-indent-action [nil nil ada-indent-broken ada-indent-broken ada-indent-broken ada-indent-broken]))% + (wisi-indent-action [nil nil nil ada-indent-broken ada-indent-broken ada-indent-broken]))% ; extended_return_object_declaration diff --git a/packages/ada-mode/ada_process_actions.adb b/packages/ada-mode/ada_process_actions.adb index 11788f3..7627acb 100644 --- a/packages/ada-mode/ada_process_actions.adb +++ b/packages/ada-mode/ada_process_actions.adb @@ -1452,7 +1452,7 @@ package body Ada_Process_Actions is null; when Indent => Indent_Action_0 (Parse_Data, Tree, Nonterm, Tokens, ((False, (Simple, (Label => None))), (False, (Simple, - (Label => None))), (False, (Simple, (Int, Ada_Indent_Broken))), (False, (Simple, (Int, Ada_Indent_Broken))), + (Label => None))), (False, (Simple, (Label => None))), (False, (Simple, (Int, Ada_Indent_Broken))), (False, (Simple, (Int, Ada_Indent_Broken))), (False, (Simple, (Int, Ada_Indent_Broken))))); end case; end expression_function_declaration_0;