[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ada-mode b08975f 5/5: Release ada-mode 7.1.6
From: |
Stephen Leake |
Subject: |
[elpa] externals/ada-mode b08975f 5/5: Release ada-mode 7.1.6 |
Date: |
Fri, 30 Jul 2021 19:33:06 -0400 (EDT) |
branch: externals/ada-mode
commit b08975f6678b5d8929fdac8864b8eb3986129996
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>
Release ada-mode 7.1.6
* .gitignore: More build artifacts.
* NEWS: Fix release date.
* README: Bump version.
* ada-mode.el:
* ada-mode.info: Update.
* ada-mode.texi: Bump version, fix menus.
* doclicense.texi: New file.
* install.sh (WISI_DIR): Simplify.
---
.gitignore | 5 +
NEWS | 2 +-
README | 2 +-
ada-mode.el | 4 +-
ada-mode.info | 423 ++++++++++++++++++++++++++--------------------
ada-mode.texi | 8 +-
doclicense.texi | 507 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
install.sh | 7 +-
prj.el | 2 +
9 files changed, 765 insertions(+), 195 deletions(-)
diff --git a/.gitignore b/.gitignore
index b96a52b..c5c341f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
/ada-mode-pkg.el
/ada-mode-autoloads.el
*.elc
+ada_lr1_parse_table.txt
+*.exe
+ada_mode_wisi_parse.gpr
+check.gpr
+obj/
diff --git a/NEWS b/NEWS
index 559d61b..b35340a 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ Please send ada-mode bug reports to bug-gnu-emacs@gnu.org, with
* Ada Mode 7.1.6
-28 Jul 2021
+30 Jul 2021
** Uses wisi 3.1.3 for compatibility with gnat FSF 11, Pro 22,
Community 2021.
diff --git a/README b/README
index f9980ca..7361dc4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 7.1.5
+Emacs Ada mode version 7.1.6
Ada mode provides auto-casing, fontification, navigation, and
indentation for Ada source code files.
diff --git a/ada-mode.el b/ada-mode.el
index 7d1959c..622579c 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,8 +6,8 @@
;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
;; Keywords: languages
;; ada
-;; Version: 7.1.5
-;; package-requires: ((uniquify-files "1.0.1") (wisi "3.1.3") (emacs "25.0"))
+;; Version: 7.1.6
+;; package-requires: ((uniquify-files "1.0.1") (wisi "3.1.3") (emacs "25.3"))
;; url: http://www.nongnu.org/ada-mode/
;;
;; This file is part of GNU Emacs.
diff --git a/ada-mode.info b/ada-mode.info
index b5ecdfd..e179e9f 100644
--- a/ada-mode.info
+++ b/ada-mode.info
@@ -1,7 +1,7 @@
This is ada-mode.info, produced by makeinfo version 6.7 from
ada-mode.texi.
-Copyright (C) 1999 - 2020 Free Software Foundation, Inc.
+Copyright (C) 1999 - 2021 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -25,7 +25,7 @@ File: ada-mode.info, Node: Top, Next: Overview, Prev:
(dir), Up: (dir)
Top
***
-Ada Mode Version 7.1.3
+Ada Mode Version 7.1.5
* Menu:
@@ -53,8 +53,8 @@ Overview
Installation
-* Ada Reference Manual::
* Ada executables::
+* Known versions::
Ada executables
@@ -94,7 +94,6 @@ Developer overview
* Directory structure::
* ELPA::
* Savannah::
-* ada-france::
@@ -159,9 +158,9 @@ File: ada-mode.info, Node: Installation, Next:
Customization, Prev: Overview,
2 Installation
**************
-Ada mode requires Emacs 25.0 or greater. Compiling the Ada code for the
+Ada mode requires Emacs 25.3 or greater. Compiling the Ada code for the
external process parser requires GNAT GPL 2017 or later; tested with
-GNAT Community Edition 2019 and GNAT Pro 19.
+GNAT Community Edition 2021 and GNAT Pro 22.2 (*note Known versions::).
Ada mode is distributed in the Gnu ELPA package archive; it can be
installed via 'M-x list-packages' (*note (emacs)Packages::). Note that
@@ -176,26 +175,18 @@ _after_ customizing 'Info-default-directory-list' (if you
do that):
ada-mode-version'.
You must also install the associated Ada executables (for the
-language parser). You may want to install the Ada Reference Manual.
+language parser). You may want to install the Ada Reference Manual in
+info format, via the ELPA package ada-ref-man.
* Menu:
-* Ada Reference Manual::
* Ada executables::
+* Known versions::
-File: ada-mode.info, Node: Ada Reference Manual, Next: Ada executables, Up:
Installation
+File: ada-mode.info, Node: Ada executables, Next: Known versions, Up:
Installation
-2.1 Ada Reference Manual
-========================
-
-The ELPA package ada-ref-man includes the Ada Reference Manual and
-Annotated Ada Reference Manual in info format.
-
-
-File: ada-mode.info, Node: Ada executables, Prev: Ada Reference Manual, Up:
Installation
-
-2.2 Ada executables
+2.1 Ada executables
===================
Ada mode requires the external parser, which must be compiled.
@@ -215,10 +206,19 @@ supports additional queries.
Both the parser and 'gpr_query' require the 'GNATCOLL' library
provided by AdaCore, distributed with GNAT GPL 2017 or later, and also
-available at Github (<https://github.com/AdaCore/gnatcoll>). The notes
-below assume that the compiler is installed at '$prefix', e.g.
-'/usr/local/gnat-2019', and that '$prefix/bin' is first on the 'PATH'.
-If you are running Windows, use mingw64 'bash' to run these commands.
+available at Github (<https://github.com/AdaCore/gnatcoll>). The parser
+builds with the gnatcoll distributed with the gnat compiler. However,
+that gnatcoll does not include the xref package, which is required by
+'gpr_query'. So we must build gnatcoll xref from sources downloaded
+from github.
+
+ The notes below assume that the compiler is installed at '$prefix',
+e.g. '/usr/local/gnat-2019', and that '$prefix/bin' is first on the
+'PATH'. If you are running Windows, use mingw64 'bash' to run these
+commands.
+
+ On some operating systems, we must install gnatcoll-iconv; other
+operating systems don't need it.
On linux, some versions of the 'GNATCOLL.iconv' package (used by
'gpr_query', but not the parser) explicitly require the 'libiconv.so'
@@ -236,10 +236,6 @@ format can change with each compiler version. 'gpr_query'
creates a
database of cross reference information; that database must be deleted
if the compiler version changes, to force a complete rebuild.
- The default binary gnatcoll distributed with GNAT GPL 2019 does not
-include the xref package, which is required by 'gpr_query'. So we must
-build gnatcoll xref from sources.
-
* Menu:
* Building GNATCOLL::
@@ -248,7 +244,7 @@ build gnatcoll xref from sources.
File: ada-mode.info, Node: Building GNATCOLL, Next: Building the
executables, Up: Ada executables
-2.2.1 Building GNATCOLL
+2.1.1 Building GNATCOLL
-----------------------
Download gnatcoll-db from <https://github.com/AdaCore/gnatcoll-db>;
@@ -258,17 +254,19 @@ ZIP".
Similarly, download gnatcoll-bindings from
<https://github.com/AdaCore/gnatcoll-bindings/tree/20.2> (for
-gnatcoll-iconv).
+gnatcoll-iconv; not needed for GNAT Community 2020 on Windows).
- Then unpack, build, and install the required components:
+ Then unpack, build, and install the required components. If you are
+unsure whether you need to install iconv, skip that step; a later step
+will complain if it is needed.
- tar xf ~/Downloads/gnatcoll-bindings-20.2.zip
+ unzip ~/Downloads/gnatcoll-bindings-20.2.zip
cd gnatcoll-bindings-20.2
cd iconv
./setup.py build
./setup.py install
- tar xf ~/Downloads/gnatcoll-db-20.2.zip
+ unzip ~/Downloads/gnatcoll-db-20.2.zip
cd gnatcoll-db-20.2
make -C sql
make -C sql install
@@ -280,7 +278,7 @@ gnatcoll-iconv).
File: ada-mode.info, Node: Building the executables, Prev: Building
GNATCOLL, Up: Ada executables
-2.2.2 Building the executables
+2.1.2 Building the executables
------------------------------
'gpr_query' requires the 'pthread' library. On Windows, this is
@@ -303,15 +301,165 @@ use 'install.sh --prefix=<dir>'.
'PATH'.
+File: ada-mode.info, Node: Known versions, Prev: Ada executables, Up:
Installation
+
+2.2 Known versions
+==================
+
+Here we list GNAT compiler versions that are known to work or not work
+with ada-mode.
+
+ There are various ways to get the compiler:
+'Community'
+ Downloaded from <https://www.adacore.com/download>. The version
+ number is the release year.
+
+ This version is provided by AdaCore, but they do not support users
+ using it.
+
+'Pro'
+ Downloaded from AdaCore via a support subscription. The version
+ number is the last two digits of the release year, followed by a
+ patch release digit.
+
+ This version is provided by AdaCore, and they support users using
+ it.
+
+'FSF'
+ Installed via a free software package manager, typically as part of
+ the "gcc" package. The version number is the same as the gcc
+ version, something like "10.3.0", possibly followed by a date.
+
+ This version is derived from some AdaCore version, but is typically
+ not identical to a released version. It may be supported by the
+ packager.
+
+ Sometimes compiler versions change what code they accept,
+particularly in the area of access types. So some compiler versions may
+require minor edits of the code; there is a "WORKAROUND" comment in the
+code describing the edit required.
+
+ Compiler versions that work:
+'Community 2019'
+ Reports an error about a dangling reference; see WORKAROUND comment
+ in
+
'~/.emacs.d/elpa/wisi-i.j.k/sal-gen_unbounded_definite_red_black_trees.adb'
+
+'Community 2020'
+ no edits required
+
+'Pro 20.2'
+ no edits required
+
+'FSF 11.1.0'
+
+ Compiler versions that fail:
+'FSF gnat 10.2.1 20210110'
+ ada-mode uses compiler option -gnat2020; that causes bogus failures
+ with this version of gnat. Reported at
+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99099>
+
+
File: ada-mode.info, Node: Customization, Next: Compiling Executing, Prev:
Installation, Up: Top
3 Customizing Ada mode
**********************
-Here we assume you are familiar with setting variables in Emacs, either
-thru 'customize' or in elisp (in your '.emacs' file). For a basic
-introduction to customize, elisp, and Emacs in general, see the tutorial
-('C-h t').
+All user-settable Ada mode variables can be set via the menu 'Ada |
+Customize'; some can also be set in wisi project files (*note Project
+files::).
+
+ To modify a specific variable, you can directly call the function
+'customize-variable'; just type 'M-x customize-variable <RET>
+VARIABLE-NAME <RET>'.
+
+ Alternately, you can specify variable settings in the Emacs
+configuration file, '~/.emacs'. This file is coded in Emacs lisp, and
+the syntax to set a variable is the following:
+
+ (setq variable-name value)
+
+ ada-mode variables that you might consider changing:
+'Matching end names'
+ By default, the option 'ada-end-name-optional' is set to 't', which
+ matches the Ada standard. This is useful for new Ada users.
+ Experienced users that follow a style guide requiring matching end
+ names should set this to 't', since that gives better error
+ correction.
+
+ Some general (non ada-mode) Emacs settings that are useful for Ada
+files:
+
+'context menu'
+ By default, the context menu is bound to <C-down-mouse-3>, i.e.
+ control-right-click. <down-mouse-3> is already bound in the global
+ map; you can override that global binding in the 'ada-mode-hook'
+ (see below for code).
+'other-frame-window-mode'
+ Ada mode does not provide any 'other-frame' or 'other-window'
+ variants of user operations. Instead, it is recommended to use the
+ Gnu ELPA package 'other-frame-window'.
+'delete-trailing-whitespace'
+ Deletes space, tab at end of line and blank lines at end of buffer.
+'xref configuration'
+ 'xref-prompt-for-identifier'
+ Set to 'nil' to be prompted less when finding definitions or
+ references.
+ 'xref-show-xrefs-function'
+ Determine placement of the window where references are shown.
+ 'xref-show-definitions-function'
+ Determine placement of the window where definitions are shown.
+ 'xref--transient-buffer-mode-map'
+ keymap used in some xref windows; you may want to disable the
+ <RET> binding there.
+'untabify'
+ Deletes tab characters that have crept into the file.
+'indent-tabs-mode'
+ Don't insert tab characters when indenting.
+'copyright-update'
+ Updates the copyright date in the file header comment, to the
+ current year.
+'electric-pair-mode'
+ Insert a matching right paren when you type a left paren.
+'hippie-expand'
+ Bind 'hippie-expand' to a key; it expands the word before point,
+ using words from current buffer, other buffers, file names, etc;
+ see 'hippie-expand-try-functions-list'. You can also add
+ 'wisi-skel-hippie-try' to that list. Note that 'wisi-skel-expand'
+ is bound to <C-c C-e> (*note Statement skeletons::).
+'imenu'
+ Navigate to subprograms and types by name, from a minibuffer menu.
+'speedbar'
+ Navigate to subprograms and types by name, from a list in a
+ dedicated window.
+'which-func'
+ Display the current subprogram name in the mode bar.
+
+ The above can all be set by the following code in your '~/.emacs'.
+Note that some are functions are added to 'before-save-hook'; they run
+just before a buffer is written to disk. Also, the order is important;
+ada-mode does not set up the Ada-specific features of imenu and speedbar
+unless imenu is loaded first.
+
+ (setq-default indent-tabs-mode nil)
+ (define-key xref--transient-buffer-mode-map (kbd "RET") 'xref-goto-xref)
+ (setq xref-prompt-for-identifier nil) ;; only prompt on C-u
+ (setq xref-show-xrefs-function #'xref--show-defs-buffer-at-bottom)
+ (setq xref-show-definitions-function #'xref--show-defs-buffer-at-bottom)
+
+ (electric-pair-mode 1)
+ (require 'imenu) ;; also enables speedbar
+ (require 'ada-mode)
+ (add-to-list 'hippie-expand-try-functions-list 'wisi-skel-hippie-try)
+ (define-key ada-mode-map "\C-e" 'hippie-expand)
+ (define-key ada-mode-map [down-mouse-3] 'ada-popup-menu)
+ (add-hook 'ada-mode-hook
+ (lambda ()
+ (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
+ (add-hook 'before-save-hook 'copyright-update nil t)
+ (add-hook 'before-save-hook
+ (lambda () (untabify (point-min) (point-max)))
+ nil t)))
* Menu:
@@ -459,93 +607,6 @@ File: ada-mode.info, Node: Other customization, Prev:
Other cross-reference,
3.5 Other customization
=======================
-All user-settable Ada mode variables can be set via the menu 'Ada |
-Customize'; some can also be set in wisi project files (*note Project
-files::).
-
- To modify a specific variable, you can directly call the function
-'customize-variable'; just type 'M-x customize-variable <RET>
-VARIABLE-NAME <RET>'.
-
- Alternately, you can specify variable settings in the Emacs
-configuration file, '~/.emacs'. This file is coded in Emacs lisp, and
-the syntax to set a variable is the following:
-
- (setq variable-name value)
-
- Some general Emacs settings that are useful for Ada files:
-
-'context menu'
- By default, the context menu is bound to <C-down-mouse-3>, i.e.
- control-right-click. <down-mouse-3> is already bound in the global
- map; you can override that global binding in the 'ada-mode-hook'
- (see below for code).
-'other-frame-window-mode'
- Ada mode does not provide any 'other-frame' or 'other-window'
- variants of user operations. Instead, it is recommended to use the
- Gnu ELPA package 'other-frame-window'.
-'delete-trailing-whitespace'
- Deletes space, tab at end of line and blank lines at end of buffer.
-'xref configuration'
- 'xref-prompt-for-identifier'
- Set to 'nil' to be prompted less when finding definitions or
- references.
- 'xref-show-xrefs-function'
- Determine placement of the window where references are shown.
- 'xref-show-definitions-function'
- Determine placement of the window where definitions are shown.
- 'xref--transient-buffer-mode-map'
- keymap used in some xref windows; you may want to disable the
- <RET> binding there.
-'untabify'
- Deletes tab characters that have crept into the file.
-'indent-tabs-mode'
- Don't insert tab characters when indenting.
-'copyright-update'
- Updates the copyright date in the file header comment, to the
- current year.
-'electric-pair-mode'
- Insert a matching right paren when you type a left paren.
-'hippie-expand'
- Bind 'hippie-expand' to a key; it expands the word before point,
- using words from current buffer, other buffers, file names, etc;
- see 'hippie-expand-try-functions-list'. You can also add
- 'wisi-skel-hippie-try' to that list. Note that 'wisi-skel-expand'
- is bound to <C-c C-e> (*note Statement skeletons::).
-'imenu'
- Navigate to subprograms and types by name, from a minibuffer menu.
-'speedbar'
- Navigate to subprograms and types by name, from a list in a
- dedicated window.
-'which-func'
- Display the current subprogram name in the mode bar.
-
- The above can all be set by the following code in your '~/.emacs'.
-Note that some are functions are added to 'before-save-hook'; they run
-just before a buffer is written to disk. Also, the order is important;
-ada-mode does not set up the Ada-specific features of imenu and speedbar
-unless imenu is loaded first.
-
- (setq-default indent-tabs-mode nil)
- (define-key xref--transient-buffer-mode-map (kbd "RET") 'xref-goto-xref)
- (setq xref-prompt-for-identifier nil) ;; only prompt on C-u
- (setq xref-show-xrefs-function #'xref--show-defs-buffer-at-bottom)
- (setq xref-show-definitions-function #'xref--show-defs-buffer-at-bottom)
-
- (electric-pair-mode 1)
- (require 'imenu) ;; also enables speedbar
- (require 'ada-mode)
- (add-to-list 'hippie-expand-try-functions-list 'wisi-skel-hippie-try)
- (define-key ada-mode-map "\C-e" 'hippie-expand)
- (define-key ada-mode-map [down-mouse-3] 'ada-popup-menu)
- (add-hook 'ada-mode-hook
- (lambda ()
- (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
- (add-hook 'before-save-hook 'copyright-update nil t)
- (add-hook 'before-save-hook
- (lambda () (untabify (point-min) (point-max)))
- nil t)))
-
File: ada-mode.info, Node: Compiling Executing, Next: Project files, Prev:
Customization, Up: Top
@@ -1938,7 +1999,6 @@ here's an overview.
* Directory structure::
* ELPA::
* Savannah::
-* ada-france::
File: ada-mode.info, Node: Directory structure, Next: ELPA, Up: Developer
overview
@@ -1959,16 +2019,13 @@ File: ada-mode.info, Node: Directory structure, Next:
ELPA, Up: Developer ove
installer.
'*.ad?'
- Ada code for the external process parser, some generated by
- the WisiToken tool 'wisitoken-bnf-generate.exe'. The
- generated code is in the tarball distribution and the monotone
- repository so users and Elisp developers don't have to install
- WisiToken.
+ Ada code for the external process parser and other tools, some
+ generated by the WisiToken tool 'wisitoken-bnf-generate.exe'.
'*.parse_table'
Diagnostic output from 'wisitoken-bnf-generate.exe', useful
for tracing parses while debugging a grammar issue. Not in
- the tarball distribution or the monotone repository.
+ any distribution.
'*.wy'
Grammar files, specifying the language to be parsed. The
@@ -2037,7 +2094,6 @@ File: ada-mode.info, Node: ELPA, Next: Savannah, Prev:
Directory structure,
Ada mode is published via the Gnu ELPA archive. To test a new version
of Ada mode, we use a local Gnu ELPA archive. That requires fetching
Gnu ELPA via git:
-
cd /Projects
git clone git://git.savannah.gnu.org/emacs/elpa.git
@@ -2050,24 +2106,30 @@ Gnu ELPA via git:
elpa workspace, and for building the elpa archive there.
-File: ada-mode.info, Node: Savannah, Next: ada-france, Prev: ELPA, Up:
Developer overview
+File: ada-mode.info, Node: Savannah, Prev: ELPA, Up: Developer overview
14.3 Savannah
=============
-The ada-mode web page, mailing list, and tarball download are hosted on
-savannah.non-gnu.org, project Emacs Ada mode
+The ada-mode git repository, web page, mailing list, and tarball
+download are hosted on savannah.non-gnu.org, project Emacs Ada mode
(<https://savannah.nongnu.org/projects/ada-mode/>). See the project
admin page there for more information.
-
-File: ada-mode.info, Node: ada-france, Prev: Savannah, Up: Developer
overview
+ To checkout all source required to build and test ada-mode, assuming
+you have ssh read/write git access to savannah ada-mode:
-14.4 ada-france
-===============
+ git clone stephen_leake@git.sv.gnu.org:/srv/git/ada-mode.git \
+ -b org.emacs.ada-mode org.emacs.ada-mode
+ cd ada-mode
+ git worktree add -b org.wisitoken ../org.wisitoken origin/org.wisitoken
+ git worktree add -b org.stephe_leake.sal ../org.stephe_leake.sal
origin/org.stephe_leake.sal
+ git worktree add -b org.stephe_leake.aunit_ext
../org.stephe_leake.aunit_ext origin/org.stephe_leake.aunit_ext
+ git worktree add -b org.stephe_leake.makerules
../org.stephe_leake.makerules origin/org.stephe_leake.makerules
-The source code for ada-mode is maintained in a monotone repository in
-the ada-france server <mtn://www.ada-france.org>.
+ In each worktree, there is a 'build' directory containing the
+Makefile and all build outputs. The target 'all' runs all tests and
+build documentation for that worktree.
File: ada-mode.info, Node: GNU Free Documentation License, Prev: Developer
overview, Up: Top
@@ -2555,46 +2617,45 @@ their use in free software.
Tag Table:
Node: Top931
-Node: Overview2711
-Node: Why not LSP?3948
-Node: Installation4704
-Node: Ada Reference Manual5670
-Node: Ada executables5931
-Node: Building GNATCOLL8285
-Node: Building the executables9180
-Node: Customization9998
-Node: Slow response10498
-Node: Non-standard file names12224
-Node: Other compiler14103
-Node: Other cross-reference14678
-Node: Other customization15401
-Node: Compiling Executing19392
-Node: Compile commands20115
-Node: Compiling Examples22807
-Node: No project files23639
-Node: Set compiler options28955
-Node: Set source search path31008
-Node: Use wisi project file33245
-Node: Use multiple GNAT project files36852
-Node: Use a Makefile41697
-Node: Compiler errors43348
-Node: Project files44165
-Node: Project file overview45217
-Node: Project file variables45759
-Node: Moving Through Ada Code49199
-Node: Identifier completion52231
-Node: Indentation54420
-Node: Statement skeletons57949
-Node: Aligning code59592
-Node: Automatic casing60537
-Node: Comment Handling62724
-Node: Key summary63243
-Node: Developer overview65973
-Node: Directory structure66302
-Node: ELPA68989
-Node: Savannah69626
-Node: ada-france69978
-Node: GNU Free Documentation License70217
+Node: Overview2690
+Node: Why not LSP?3927
+Node: Installation4683
+Node: Ada executables5719
+Node: Building GNATCOLL8231
+Node: Building the executables9285
+Node: Known versions10103
+Node: Customization11977
+Node: Slow response16480
+Node: Non-standard file names18206
+Node: Other compiler20085
+Node: Other cross-reference20660
+Node: Other customization21383
+Node: Compiling Executing21533
+Node: Compile commands22256
+Node: Compiling Examples24948
+Node: No project files25780
+Node: Set compiler options31096
+Node: Set source search path33149
+Node: Use wisi project file35386
+Node: Use multiple GNAT project files38993
+Node: Use a Makefile43838
+Node: Compiler errors45489
+Node: Project files46306
+Node: Project file overview47358
+Node: Project file variables47900
+Node: Moving Through Ada Code51340
+Node: Identifier completion54372
+Node: Indentation56561
+Node: Statement skeletons60090
+Node: Aligning code61733
+Node: Automatic casing62678
+Node: Comment Handling64865
+Node: Key summary65384
+Node: Developer overview68114
+Node: Directory structure68428
+Node: ELPA70924
+Node: Savannah71560
+Node: GNU Free Documentation License72756
End Tag Table
diff --git a/ada-mode.texi b/ada-mode.texi
index 35610be..8d3dfa6 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@titlepage
@sp 10
-@title Ada Mode Version 7.1.5
+@title Ada Mode Version 7.1.6
@page
@vskip 0pt plus 1filll
@insertcopying
@@ -37,7 +37,7 @@ developing GNU and promoting software freedom.''
@node Top, Overview, (dir), (dir)
@top Top
-Ada Mode Version 7.1.5
+Ada Mode Version 7.1.6
@end ifnottex
@menu
@@ -66,8 +66,8 @@ Overview
Installation
-* Ada Reference Manual::
* Ada executables::
+* Known versions::
Ada executables
@@ -192,7 +192,7 @@ format, via the ELPA package ada-ref-man.
@menu
* Ada executables::
-* Known versions
+* Known versions::
@end menu
@node Ada executables
diff --git a/doclicense.texi b/doclicense.texi
new file mode 100644
index 0000000..a511ffc
--- /dev/null
+++ b/doclicense.texi
@@ -0,0 +1,507 @@
+@c -*-texinfo-*-
+@c The GNU Free Documentation License.
+@center Version 1.3, 3 November 2008
+
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
+
+@display
+Copyright @copyright{} 2000, 2001, 2002, 2007, 2008, 2009 Free Software
Foundation, Inc.
+@uref{http://fsf.org/}
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+@end display
+
+@enumerate 0
+@item
+PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document @dfn{free} in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of ``copyleft'', which means that derivative
+works of the document must themselves be free in the same sense. It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does. But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book. We recommend this License
+principally for works whose purpose is instruction or reference.
+
+@item
+APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License. Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein. The ``Document'', below,
+refers to any such manual or work. Any member of the public is a
+licensee, and is addressed as ``you''. You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A ``Modified Version'' of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A ``Secondary Section'' is a named appendix or a front-matter section
+of the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject. (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.) The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The ``Invariant Sections'' are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License. If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant. The Document may contain zero
+Invariant Sections. If the Document does not identify any Invariant
+Sections then there are none.
+
+The ``Cover Texts'' are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License. A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A ``Transparent'' copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters. A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text. A copy that is not ``Transparent'' is called ``Opaque''.
+
+Examples of suitable formats for Transparent copies include plain
+@sc{ascii} without markup, Texinfo input format, La@TeX{} input
+format, @acronym{SGML} or @acronym{XML} using a publicly available
+@acronym{DTD}, and standard-conforming simple @acronym{HTML},
+PostScript or @acronym{PDF} designed for human modification. Examples
+of transparent image formats include @acronym{PNG}, @acronym{XCF} and
+@acronym{JPG}. Opaque formats include proprietary formats that can be
+read and edited only by proprietary word processors, @acronym{SGML} or
+@acronym{XML} for which the @acronym{DTD} and/or processing tools are
+not generally available, and the machine-generated @acronym{HTML},
+PostScript or @acronym{PDF} produced by some word processors for
+output purposes only.
+
+The ``Title Page'' means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page. For works in
+formats which do not have any title page as such, ``Title Page'' means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+The ``publisher'' means any person or entity that distributes copies
+of the Document to the public.
+
+A section ``Entitled XYZ'' means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language. (Here XYZ stands for a
+specific section name mentioned below, such as ``Acknowledgements'',
+``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title''
+of such a section when you modify the Document means that it remains a
+section ``Entitled XYZ'' according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document. These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+@item
+VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License. You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute. However, you may accept
+compensation in exchange for copies. If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+@item
+COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover. Both covers must also clearly and legibly identify
+you as the publisher of these copies. The front cover must present
+the full title with all words of the title equally prominent and
+visible. You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+@item
+MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it. In addition, you must do these things in the Modified Version:
+
+@enumerate A
+@item
+Use in the Title Page (and on the covers, if any) a title distinct
+from that of the Document, and from those of previous versions
+(which should, if there were any, be listed in the History section
+of the Document). You may use the same title as a previous version
+if the original publisher of that version gives permission.
+
+@item
+List on the Title Page, as authors, one or more persons or entities
+responsible for authorship of the modifications in the Modified
+Version, together with at least five of the principal authors of the
+Document (all of its principal authors, if it has fewer than five),
+unless they release you from this requirement.
+
+@item
+State on the Title page the name of the publisher of the
+Modified Version, as the publisher.
+
+@item
+Preserve all the copyright notices of the Document.
+
+@item
+Add an appropriate copyright notice for your modifications
+adjacent to the other copyright notices.
+
+@item
+Include, immediately after the copyright notices, a license notice
+giving the public permission to use the Modified Version under the
+terms of this License, in the form shown in the Addendum below.
+
+@item
+Preserve in that license notice the full lists of Invariant Sections
+and required Cover Texts given in the Document's license notice.
+
+@item
+Include an unaltered copy of this License.
+
+@item
+Preserve the section Entitled ``History'', Preserve its Title, and add
+to it an item stating at least the title, year, new authors, and
+publisher of the Modified Version as given on the Title Page. If
+there is no section Entitled ``History'' in the Document, create one
+stating the title, year, authors, and publisher of the Document as
+given on its Title Page, then add an item describing the Modified
+Version as stated in the previous sentence.
+
+@item
+Preserve the network location, if any, given in the Document for
+public access to a Transparent copy of the Document, and likewise
+the network locations given in the Document for previous versions
+it was based on. These may be placed in the ``History'' section.
+You may omit a network location for a work that was published at
+least four years before the Document itself, or if the original
+publisher of the version it refers to gives permission.
+
+@item
+For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
+the Title of the section, and preserve in the section all the
+substance and tone of each of the contributor acknowledgements and/or
+dedications given therein.
+
+@item
+Preserve all the Invariant Sections of the Document,
+unaltered in their text and in their titles. Section numbers
+or the equivalent are not considered part of the section titles.
+
+@item
+Delete any section Entitled ``Endorsements''. Such a section
+may not be included in the Modified Version.
+
+@item
+Do not retitle any existing section to be Entitled ``Endorsements'' or
+to conflict in title with any Invariant Section.
+
+@item
+Preserve any Warranty Disclaimers.
+@end enumerate
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant. To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled ``Endorsements'', provided it contains
+nothing but endorsements of your Modified Version by various
+parties---for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version. Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity. If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+@item
+COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy. If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled ``History''
+in the various original documents, forming one section Entitled
+``History''; likewise combine any sections Entitled ``Acknowledgements'',
+and any sections Entitled ``Dedications''. You must delete all
+sections Entitled ``Endorsements.''
+
+@item
+COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+@item
+AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an ``aggregate'' if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+@item
+TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections. You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers. In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled ``Acknowledgements'',
+``Dedications'', or ``History'', the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+@item
+TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+
+@item
+FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns. See
+@uref{http://www.gnu.org/copyleft/}.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License ``or any later version'' applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation. If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation. If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+@item
+RELICENSING
+
+``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works. A
+public wiki that anybody can edit is an example of such a server. A
+``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
+site means any set of copyrightable works thus published on the MMC
+site.
+
+``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
+published by that same organization.
+
+``Incorporate'' means to publish or republish a Document, in whole or
+in part, as part of another Document.
+
+An MMC is ``eligible for relicensing'' if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole
+or in part into the MMC, (1) had no cover texts or invariant sections,
+and (2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
+@end enumerate
+
+@page
+@heading ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+@smallexample
+@group
+ Copyright (C) @var{year} @var{your name}.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+ Texts. A copy of the license is included in the section entitled ``GNU
+ Free Documentation License''.
+@end group
+@end smallexample
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the ``with@dots{}Texts.'' line with this:
+
+@smallexample
+@group
+ with the Invariant Sections being @var{list their titles}, with
+ the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
+ being @var{list}.
+@end group
+@end smallexample
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
+
+@c Local Variables:
+@c ispell-local-pdict: "ispell-dict"
+@c End:
diff --git a/install.sh b/install.sh
index 4f6f518..e27f58f 100755
--- a/install.sh
+++ b/install.sh
@@ -8,12 +8,7 @@
# If you don't have write permission in the GNAT installation
# directory, you need to use --prefix=<dir>, or run with root priviledges.
-if [ -d ../wisi-3.1.? ]; then
- WISI_DIR=`ls -d ../wisi-3.1.?`
-else
- # try devel version
- WISI_DIR=`ls -d ../wisi-3.1.?.0.*`
-fi
+WISI_DIR=`ls -d ../wisi*`
gprinstall -f -p -P ada_mode_wisi_parse.gpr -aP $WISI_DIR
--install-name=ada_mode_wisi_parse $1
diff --git a/prj.el b/prj.el
index c5f46c8..b1bd7de 100644
--- a/prj.el
+++ b/prj.el
@@ -15,4 +15,6 @@
"Makefile"
))
+(wisi-prj-delete "ada_mode elpa")
+
;; end of file