merge trunk

[gnu-emacs] / lisp / progmodes / ada-mode.el

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index beb737ba61349d00f5793796ae5775b663a5d577..17ff4bd32a683667fbfde22cf37f198722fb94ee 100644 (file)
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -105,8 +105,8 @@
 ;; should be loaded before the ada-mode, which will then setup some variables
 ;; to improve the support for Ada code.
 ;; Here is the list of these modes:
 ;; should be loaded before the ada-mode, which will then setup some variables
 ;; to improve the support for Ada code.
 ;; Here is the list of these modes:

-;;   `which-function-mode': Display the name of the subprogram the cursor is
-;;      in in the mode line.
+;;   `which-function-mode': Display in the modeline the name of the subprogram
+;;      the cursor is in.

 ;;   `outline-mode': Provides the capability to collapse or expand the code
 ;;      for specific language constructs, for instance if you want to hide the
 ;;      code corresponding to a subprogram
 ;;   `outline-mode': Provides the capability to collapse or expand the code
 ;;      for specific language constructs, for instance if you want to hide the
 ;;      code corresponding to a subprogram


@@ -499,7 +499,7 @@ Used to define `ada-*-keywords.'"))
 
 (defvar ada-case-exception-substring '()
   "Alist of substrings (entities) that have special casing.
 
 (defvar ada-case-exception-substring '()
   "Alist of substrings (entities) that have special casing.

-The substrings are detected for word constituant when the word
+The substrings are detected for word constituent when the word

 is not itself in `ada-case-exception', and only for substrings that
 either are at the beginning or end of the word, or start after '_'.")
 
 is not itself in `ada-case-exception', and only for substrings that
 either are at the beginning or end of the word, or start after '_'.")
 


@@ -826,7 +826,7 @@ the 4 file locations can be clicked on and jumped to."
 ;; to be considered as part of a word or not.
 ;; Some characters may have multiple meanings depending on the context:
 ;;  - ' is either the beginning of a constant character or an attribute
 ;; to be considered as part of a word or not.
 ;; Some characters may have multiple meanings depending on the context:
 ;;  - ' is either the beginning of a constant character or an attribute

-;;  - # is either part of a based litteral or a gnatprep statement.
+;;  - # is either part of a based literal or a gnatprep statement.

 ;;  - " starts a string, but not if inside a constant character.
 ;;  - ( and ) should be ignored if inside a constant character.
 ;; Thus their syntax property is changed automatically, and we can still use
 ;;  - " starts a string, but not if inside a constant character.
 ;;  - ( and ) should be ignored if inside a constant character.
 ;; Thus their syntax property is changed automatically, and we can still use


@@ -966,7 +966,7 @@ are treated as numbers instead of gnatprep comments."
     (unless modified
       (restore-buffer-modified-p nil))))
 
     (unless modified
       (restore-buffer-modified-p nil))))
 

-(defun ada-after-change-function (beg end old-len)
+(defun ada-after-change-function (beg end _old-len)

   "Called when the region between BEG and END was changed in the buffer.
 OLD-LEN indicates what the length of the replaced text was."
   (save-excursion
   "Called when the region between BEG and END was changed in the buffer.
 OLD-LEN indicates what the length of the replaced text was."
   (save-excursion


@@ -1675,7 +1675,7 @@ ARG is the prefix the user entered with \\[universal-argument]."
          '( ?` ?_ ?# ?% ?& ?* ?( ?) ?- ?= ?+
                ?| ?\; ?: ?' ?\" ?< ?, ?. ?> ?/ ?\n 32 ?\r )))
 
          '( ?` ?_ ?# ?% ?& ?* ?( ?) ?- ?= ?+
                ?| ?\; ?: ?' ?\" ?< ?, ?. ?> ?/ ?\n 32 ?\r )))
 

-(defun ada-loose-case-word (&optional arg)
+(defun ada-loose-case-word (&optional _arg)

   "Upcase first letter and letters following `_' in the following word.
 No other letter is modified.
 ARG is ignored, and is there for compatibility with `capitalize-word' only."
   "Upcase first letter and letters following `_' in the following word.
 No other letter is modified.
 ARG is ignored, and is there for compatibility with `capitalize-word' only."


@@ -1691,16 +1691,16 @@ ARG is ignored, and is there for compatibility with `capitalize-word' only."
        (insert-char (upcase (following-char)) 1)
        (delete-char 1)))))
 
        (insert-char (upcase (following-char)) 1)
        (delete-char 1)))))
 

-(defun ada-no-auto-case (&optional arg)
+(defun ada-no-auto-case (&optional _arg)

   "Do nothing.  ARG is ignored.
 This function can be used for the auto-casing variables in Ada mode, to
   "Do nothing.  ARG is ignored.
 This function can be used for the auto-casing variables in Ada mode, to

-adapt to unusal auto-casing schemes.  Since it does nothing, you can for
+adapt to unusual auto-casing schemes.  Since it does nothing, you can for

 instance use it for `ada-case-identifier' if you don't want any special
 auto-casing for identifiers, whereas keywords have to be lower-cased.
 See also `ada-auto-case' to disable auto casing altogether."
   nil)
 
 instance use it for `ada-case-identifier' if you don't want any special
 auto-casing for identifiers, whereas keywords have to be lower-cased.
 See also `ada-auto-case' to disable auto casing altogether."
   nil)
 

-(defun ada-capitalize-word (&optional arg)
+(defun ada-capitalize-word (&optional _arg)

   "Upcase first letter and letters following '_', lower case other letters.
 ARG is ignored, and is there for compatibility with `capitalize-word' only."
   (interactive)
   "Upcase first letter and letters following '_', lower case other letters.
 ARG is ignored, and is there for compatibility with `capitalize-word' only."
   (interactive)


@@ -1773,7 +1773,7 @@ ATTENTION: This function might take very long for big buffers!"
 ;;    `ada-insert-paramlist'.
 ;; Both steps are called from `ada-format-paramlist'.
 ;; Note: Comments inside the parameter list are lost.
 ;;    `ada-insert-paramlist'.
 ;; Both steps are called from `ada-format-paramlist'.
 ;; Note: Comments inside the parameter list are lost.

-;;       The syntax has to be correct, or the reformating will fail.
+;;       The syntax has to be correct, or the reformatting will fail.

 ;;--------------------------------------------------------------
 
 (defun ada-format-paramlist ()
 ;;--------------------------------------------------------------
 
 (defun ada-format-paramlist ()


@@ -2139,7 +2139,7 @@ command like:
 
   (while command-line-args-left
     (let ((source (car command-line-args-left)))
 
   (while command-line-args-left
     (let ((source (car command-line-args-left)))

-      (message "Formating %s" source)
+      (message "Formatting %s" source)

       (find-file source)
       (ada-indent-region (point-min) (point-max))
       (ada-adjust-case-buffer)
       (find-file source)
       (ada-indent-region (point-min) (point-max))
       (ada-adjust-case-buffer)


@@ -3939,7 +3939,7 @@ If NOERROR is non-nil, it only returns nil if no matching start found."
        ;; processing them recursively avoids the need for any special
        ;; handling.
        ;; Nothing should be done if we have only the specs or a
        ;; processing them recursively avoids the need for any special
        ;; handling.
        ;; Nothing should be done if we have only the specs or a

-       ;; generic instantion.
+       ;; generic instantiation.

 
        ((and (looking-at "\\<procedure\\|function\\>"))
        (if first
 
        ((and (looking-at "\\<procedure\\|function\\>"))
        (if first


@@ -4219,7 +4219,7 @@ of the region.  Otherwise, operate only on the current line."
        ((eq ada-tab-policy 'always-tab) (error "Not implemented"))
        ))
 
        ((eq ada-tab-policy 'always-tab) (error "Not implemented"))
        ))
 

-(defun ada-untab (arg)
+(defun ada-untab (_arg)

   "Delete leading indenting according to `ada-tab-policy'."
   ;; FIXME: ARG is ignored
   (interactive "P")
   "Delete leading indenting according to `ada-tab-policy'."
   ;; FIXME: ARG is ignored
   (interactive "P")


@@ -4401,7 +4401,7 @@ Moves to 'begin' if in a declarative part."
           (ada-goto-matching-end 1))
 
          ;; on first line of subprogram body
           (ada-goto-matching-end 1))
 
          ;; on first line of subprogram body

-         ;; Do nothing for specs or generic instantion, since these are
+         ;; Do nothing for specs or generic instantiation, since these are

          ;; handled as the general case (find the enclosing block)
          ;; We also need to make sure that we ignore nested subprograms
          ((save-excursion
          ;; handled as the general case (find the enclosing block)
          ;; We also need to make sure that we ignore nested subprograms
          ((save-excursion


@@ -5250,7 +5250,7 @@ Return nil if no body was found."
 ;;  Support for narrow-to-region
 ;; ---------------------------------------------------------
 
 ;;  Support for narrow-to-region
 ;; ---------------------------------------------------------
 

-(defun ada-narrow-to-defun (&optional arg)
+(defun ada-narrow-to-defun (&optional _arg)

   "Make text outside current subprogram invisible.
 The subprogram visible is the one that contains or follow point.
 Optional ARG is ignored.
   "Make text outside current subprogram invisible.
 The subprogram visible is the one that contains or follow point.
 Optional ARG is ignored.