branch: externals/ada-mode
commit 4ae81da5796be67eff9cad4489208d54fa7b9440
Author: Stefan Kangas <stefankan...@gmail.com>
Commit: Stefan Kangas <stefankan...@gmail.com>
Fix typos
* NEWS:
* ada-core.el:
* ada-indent-user-options.el:
* ada-mode.el:
* ada-mode.texi:
* ada_annex_p.wy:
* wisitoken-parse-lr-mckenzie_recover-ada.adb: Fix typos.
---
NEWS | 6 +++---
ada-core.el | 6 +++---
ada-indent-user-options.el | 2 +-
ada-mode.el | 2 +-
ada-mode.texi | 8 ++++----
ada_annex_p.wy | 4 ++--
wisitoken-parse-lr-mckenzie_recover-ada.adb | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/NEWS b/NEWS
index 77d1d444f3..937becf1a1 100644
--- a/NEWS
+++ b/NEWS
@@ -340,7 +340,7 @@ Please send ada-mode bug reports to bug-gnu-em...@gnu.org,
with
point.
** New indent option: 'ada-indent-after-trailing-comment' If t (the
- default), align comment lines imediately following a comment on the
+ default), align comment lines immediately following a comment on the
same line as code with the preceding comment. Otherwise, ignore the
preceding comment.
@@ -360,7 +360,7 @@ Please send ada-mode bug reports to bug-gnu-em...@gnu.org,
with
17 Nov 2018
** Use wisi 2.0; indentation computed directly in parser actions. This
- has a few user visible changes in indention, making it more
+ has a few user visible changes in indentation, making it more
consistent. It also makes it faster, so larger files are handled
more smoothly.
@@ -482,7 +482,7 @@ Please send ada-mode bug reports to bug-gnu-em...@gnu.org,
with
identifier (ie +Tree).
** When a 'use type' clause is inserted by the compile error
- correction code, 'use all type' is inserted if the lanuage version
+ correction code, 'use all type' is inserted if the language version
is 2012 (the default).
** The context menu is simplified.
diff --git a/ada-core.el b/ada-core.el
index d15c4d01c5..75f34d1b2e 100644
--- a/ada-core.el
+++ b/ada-core.el
@@ -130,7 +130,7 @@ declarative region start, goto containing region start."
;; where point is in the whitespace or comment before a block; we
;; want the containing block, not the next block.
;;
- ;; The typical use case for calling this fuction is to add a
+ ;; The typical use case for calling this function is to add a
;; use_clause for an identifier/operator at start-pos.
(while (not done)
@@ -414,7 +414,7 @@ excluding leading pragmas."
(defun ada-fix-sort-context-pred (a b)
"Predicate for `sort-subr'; sorts \"limited with\", \"private with\" last.
-Returns non-nil if a should preceed b in buffer."
+Returns non-nil if a should precede b in buffer."
;; a, b are buffer ranges in the current buffer
(cl-flet
((starts-with
@@ -758,7 +758,7 @@ Deselects the current project first."
(make-obsolete 'ada-select-prj-file 'wisi-prj-select-cache "ada-mode 7.0")
(cl-defmethod wisi-prj-identifier-at-point ((_project ada-prj))
- ;; Handle adjacent operator/identifer like:
+ ;; Handle adjacent operator/identifier like:
;; test/ada_mode-slices.adb
;; D1, D2 : Day := +Sun;
;;
diff --git a/ada-indent-user-options.el b/ada-indent-user-options.el
index 4e4e18d48d..a041bcfe7c 100644
--- a/ada-indent-user-options.el
+++ b/ada-indent-user-options.el
@@ -178,7 +178,7 @@ the expression."
(make-obsolete-variable 'ada-indent-hanging-rel-exp "" "ada-mode 4.0.0")
(defcustom ada-indent-after-trailing-comment t
- "If t, align comment lines imediately following a comment on the
+ "If t, align comment lines immediately following a comment on the
same line as code with the preceding comment. Otherwise, ignore
the preceding comment."
:type 'boolean
diff --git a/ada-mode.el b/ada-mode.el
index 7ac578612a..e775f9971c 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -1685,7 +1685,7 @@ Unless WAIT, does not wait for parser to respond. Returns
the parser object."
;; elsewhere before Ada files opened; start eglot in
;; wisi-select-prj.
;;
- ;; In order to accomodate 1 and 2, we call ada-eglot-setup and wisi-setup in
+ ;; In order to accommodate 1 and 2, we call ada-eglot-setup and wisi-setup in
;; ada-mode-post-local-vars.
(add-hook 'hack-local-variables-hook #'ada-mode-post-local-vars nil t)
)
diff --git a/ada-mode.texi b/ada-mode.texi
index f19895718f..f76dabee9d 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -554,7 +554,7 @@ names, and the extension for specs and bodies are
@samp{.ads} and @samp{.adb}, respectively.
Emacs uses the file extension to enable Ada mode; Ada mode uses the
-file extentions to allow moving from a package body to the
+file extensions to allow moving from a package body to the
corresponding spec and back.
Emacs and Ada mode support ways to use alternative file extensions for
@@ -1143,7 +1143,7 @@ You can create a casing exception by editing the file
directly, or via
the @code{Ada | Casing} menu.
@code{gpr_project_path} and @code{casing} are list variables; each
-occurence in a wisi project file adds an entry to the list.
+occurrence in a wisi project file adds an entry to the list.
In addition, create a directory @file{Example_4/More},
containing these files:
@@ -1553,7 +1553,7 @@ menu commands:
@table @asis
@item @code{check_cmd} [default: @code{ada-build-check-cmd}]
-Compiler commannd to syntax check a single file.
+Compiler command to syntax check a single file.
@item @code{main} [default: basename of current file name]
File name of executable to build.
@@ -1732,7 +1732,7 @@ can also configure the indentation, via the following
variables:
Number of columns for default indentation.
@item @code{ada-indent-after-trailing-comment} (default value t)
-If t, align comment lines imediately following a comment on the
+If t, align comment lines immediately following a comment on the
same line as code with the preceding comment. Otherwise, ignore
the preceding comment.
diff --git a/ada_annex_p.wy b/ada_annex_p.wy
index efb033cec0..fc7b838d51 100644
--- a/ada_annex_p.wy
+++ b/ada_annex_p.wy
@@ -130,7 +130,7 @@ tick : TICK_1 | TICK_2 ;
%non_grammar <comment-new-line> GNAT_PREP_END_IF "#end if"
;; skeleton placeholders. Also terminated by newline, EOI to avoid
-;; accidently commenting out multiple lines.
+;; accidentally commenting out multiple lines.
%non_grammar <comment-one-line> PLACEHOLDER "{" "}"
;; git conflict marks. ada_mode-recover_conflict_marks.adb
@@ -1711,7 +1711,7 @@ extended_return_object_declaration
extended_return_statement
: 'return' extended_return_object_declaration ['do'
handled_sequence_of_statements 'end' 'return'] ';'
- ;; indent the same as a simple return statment
+ ;; indent the same as a simple return statement
;; test/ada_mode-nominal.adb
;; return B : Integer :=
;; (Local_Function);
diff --git a/wisitoken-parse-lr-mckenzie_recover-ada.adb
b/wisitoken-parse-lr-mckenzie_recover-ada.adb
index c9e1746ab3..50e4f2d1fd 100644
--- a/wisitoken-parse-lr-mckenzie_recover-ada.adb
+++ b/wisitoken-parse-lr-mckenzie_recover-ada.adb
@@ -445,7 +445,7 @@ package body WisiToken.Parse.LR.McKenzie_Recover.Ada is
Delete_Check
(Super, Shared_Parser, New_Config, (+END_ID,
Tree.Element_ID (Keyword_Item.Token), +SEMICOLON_ID));
else
- -- We don't need to delete the identifier|name ; it is
missing and therefor empty.
+ -- We don't need to delete the identifier|name ; it is
missing and therefore empty.
Delete_Check (Super, Shared_Parser, New_Config, (+END_ID,
+SEMICOLON_ID));
end if;
@@ -1161,7 +1161,7 @@ package body WisiToken.Parse.LR.McKenzie_Recover.Ada is
-- d: There is a missing matching component_statement start
--
-- We can't reliably distinguish between a: and b:, so we do both. c:
- -- is distinquished by the minimal action being 'reduce to name'. d:
+ -- is distinguished by the minimal action being 'reduce to name'. d:
-- is distinguished by searching for an open matching
-- component_statement start.
