from trunk

10 files changed, 33 insertions, 34 deletions

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index d0affdc0726..2b94fdb25ff 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -229,11 +229,13 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
                  (const ada-no-auto-case))
   :group 'ada)
 
-;; FIXME If this is not something required by the ada language, this
-;; should be removed.
 (defcustom ada-clean-buffer-before-saving t
   "*Non-nil means remove trailing spaces and untabify the buffer before saving."
   :type 'boolean :group 'ada)
+(make-obsolete-variable 'ada-clean-buffer-before-saving
+                        "use the `write-file-functions' hook."
+                        "23.2")
+
 
 (defcustom ada-indent 3
   "*Size of Ada indentation.
@@ -672,7 +674,7 @@ A new statement starts after these.")
 
 (defvar ada-subprog-start-re
   (eval-when-compile
-    (concat "\\<" (regexp-opt '("accept" "entry" "function" "package" "procedure"
+    (concat "\\<" (regexp-opt '("accept" "entry" "function" "overriding" "package" "procedure"
                                 "protected" "task") t) "\\>"))
   "Regexp for the start of a subprogram.")
 
@@ -719,7 +721,7 @@ displaying the menu if point was on an identifier."
 (defconst ada-imenu-comment-re "\\([ \t]*--.*\\)?")
 
 (defconst ada-imenu-subprogram-menu-re
-  (concat "^[ \t]*\\(procedure\\|function\\)[ \t\n]+"
+  (concat "^[ \t]*\\(overriding[ \t]*\\)?\\(procedure\\|function\\)[ \t\n]+"
           "\\(\\(\\sw\\|_\\)+\\)[ \t\n]*\\([ \t\n]\\|([^)]+)"
           ada-imenu-comment-re
           "\\)[ \t\n]*"
@@ -727,7 +729,7 @@ displaying the menu if point was on an identifier."
 
 (defvar ada-imenu-generic-expression
   (list
-   (list nil ada-imenu-subprogram-menu-re 2)
+   (list nil ada-imenu-subprogram-menu-re 3)
    (list "*Specs*"
          (concat
           "^[ \t]*\\(procedure\\|function\\)[ \t\n]+\\(\\(\\sw\\|_\\)+\\)"
@@ -1303,14 +1305,6 @@ the file name."
 
   (set-syntax-table ada-mode-syntax-table)
 
-  (if ada-clean-buffer-before-saving
-      (progn
-        ;; remove all spaces at the end of lines in the whole buffer.
-        (add-hook 'local-write-file-hooks 'delete-trailing-whitespace)
-        ;; convert all tabs to the correct number of spaces.
-        (add-hook 'local-write-file-hooks
-                  (lambda () (untabify (point-min) (point-max))))))
-
   (set (make-local-variable 'skeleton-further-elements)
        '((< '(backward-delete-char-untabify
               (min ada-indent (current-column))))))
@@ -2483,7 +2477,7 @@ and the offset."
             (list (progn (back-to-indentation) (point)) 'ada-indent))
         (save-excursion
           (ada-goto-stmt-start)
-          (if (looking-at "\\<package\\|procedure\\|function\\>")
+          (if (looking-at "\\<overriding\\|package\\|procedure\\|function\\>")
               (list (progn (back-to-indentation) (point)) 0)
             (list (progn (back-to-indentation) (point)) 'ada-indent)))))
 
@@ -2632,20 +2626,23 @@ and the offset."
            (looking-at "\\<\\(package\\|function\\|procedure\\)\\>"))
       (save-excursion
         ;;  Go up until we find either a generic section, or the end of the
-        ;;  previous subprogram/package
+        ;;  previous subprogram/package, or 'overriding' for this function/procedure
         (let (found)
           (while (and (not found)
                       (ada-search-ignore-string-comment
-             "\\<\\(generic\\|end\\|begin\\|package\\|procedure\\|function\\)\\>" t))
+             "\\<\\(generic\\|end\\|begin\\|overriding\\|package\\|procedure\\|function\\)\\>" t))
 
             ;;  avoid "with procedure"... in generic parts
             (save-excursion
               (forward-word -1)
               (setq found (not (looking-at "with"))))))
 
-        (if (looking-at "generic")
-            (list (progn (back-to-indentation) (point)) 0)
-          (ada-indent-on-previous-lines nil orgpoint orgpoint))))
+        (cond
+         ((looking-at "\\<generic\\|overriding\\>")
+          (list (progn (back-to-indentation) (point)) 0))
+
+         (t
+          (ada-indent-on-previous-lines nil orgpoint orgpoint)))))
 
      ;;---------------------------------
      ;; label
@@ -4571,6 +4568,8 @@ Moves to 'begin' if in a declarative part."
 
   (define-key ada-mode-extra-map "u"  'ada-prj-edit)
 
+  (define-key ada-mode-map "\C-xnd" 'ada-narrow-to-defun); override narrow-to-defun
+
   ;;  The templates, defined in ada-stmt.el
 
   (let ((map (make-sparse-keymap)))
@@ -5063,7 +5062,7 @@ Since the search can be long, the results are cached."
 
           ;; Get the function name, but not the properties, or this changes
           ;; the face in the modeline on Emacs 21
-          (setq func-name (match-string-no-properties 2))
+          (setq func-name (match-string-no-properties 3))
           (if (and (not (ada-in-comment-p))
                    (not (save-excursion
                           (goto-char (match-end 0))
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index 91058890d46..103bc093bdb 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -187,7 +187,7 @@ Indent for the first line of code."
 
 
 (define-skeleton ada-if
-  "Insert skeleton if statment, prompting for a boolean-expression."
+  "Insert skeleton if statement, prompting for a boolean-expression."
   "[condition]: "
   "if " str " then" \n
   > _ \n
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index dd54736ef0b..bf836b20eee 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -755,7 +755,7 @@ is non-nil, prompt the user to select one.  If none are found, return
   (let ((file (buffer-file-name nil)))
     (list
      ;; variable name alphabetical order
-     'ada_project_path  ""
+     'ada_project_path (or (getenv "ADA_PROJECT_PATH") "")
      'ada_project_path_sep  ada-prj-ada-project-path-sep
      'bind_opt        ada-prj-default-bind-opt
      'build_dir       default-directory
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index e642cf360a1..de0cd896b8e 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -1010,7 +1010,7 @@ MODE is either a mode symbol or a list of mode symbols."
          `(c-clear-char-property-fun ,pos ',property))))
 
 (defmacro c-clear-char-properties (from to property)
-  ;; Remove all the occurences of the given property in the given
+  ;; Remove all the occurrences of the given property in the given
   ;; region that has been put with `c-put-char-property'.  PROPERTY is
   ;; assumed to be constant.
   ;;
@@ -1035,7 +1035,7 @@ which have the value VALUE, as tested by `equal'.  These
 properties are assumed to be over individual characters, having
 been put there by c-put-char-property.  POINT remains unchanged."
   (let ((place from) end-place)
-    (while                        ; loop round occurrances of (PROPERTY VALUE)
+    (while                        ; loop round occurrences of (PROPERTY VALUE)
         (progn
           (while           ; loop round changes in PROPERTY till we find VALUE
               (and
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f1e6bf98ece..0e6358aeee1 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -447,7 +447,7 @@ comment at the start of cc-engine.el for more info."
   (c-put-char-property pos 'c-type value))
 
 (defun c-clear-c-type-property (from to value)
-  ;; Remove all occurences of the c-type property that has the given
+  ;; Remove all occurrences of the c-type property that has the given
   ;; value in the region between FROM and TO.  VALUE is assumed to not
   ;; be nil.
   ;;
@@ -555,7 +555,7 @@ the previous one if already at the beginning of one.  Only
 statements/declarations on the same level are considered, i.e. don't
 move into or out of sexps (not even normal expression parentheses).
 
-If point is already at the earliest statment within braces or parens,
+If point is already at the earliest statement within braces or parens,
 this function doesn't move back into any whitespace preceding it; it
 returns 'same in this case.
 
@@ -605,7 +605,7 @@ comment at the start of cc-engine.el for more info."
   ;; The bulk of this function is a pushdown automaton that looks at statement
   ;; boundaries and the tokens (such as "while") in c-opt-block-stmt-key.  Its
   ;; purpose is to keep track of nested statements, ensuring that such
-  ;; statments are skipped over in their entirety (somewhat akin to what C-M-p
+  ;; statements are skipped over in their entirety (somewhat akin to what C-M-p
   ;; does with nested braces/brackets/parentheses).
   ;;
   ;; Note: The position of a boundary is the following token.
@@ -4394,7 +4394,7 @@ comment at the start of cc-engine.el for more info."
   ;;    `c-decl-prefix-or-start-re' when that submatch matches.
   ;; o  The start of each `c-decl-prefix-or-start-re' match when
   ;;    submatch 1 doesn't match.
-  ;; o  The first token after the end of each occurence of the
+  ;; o  The first token after the end of each occurrence of the
   ;;    `c-type' text property with the value `c-decl-end', provided
   ;;    `c-type-decl-end-used' is set.
   ;;
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 7763a5d9283..907c308daca 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1327,7 +1327,7 @@ on level 2 only and so aren't combined with `c-complex-decl-matchers'."
       ,@(when (c-lang-const c-recognize-<>-arglists)
           `(c-font-lock-<>-arglists))
 
-      ;; The first two rules here mostly find occurences that
+      ;; The first two rules here mostly find occurrences that
       ;; `c-font-lock-declarations' has found already, but not
       ;; declarations containing blocks in the type (see note below).
       ;; It's also useful to fontify these everywhere to show e.g. when
@@ -2117,7 +2117,7 @@ need for `pike-font-lock-extra-types'.")
 
 (defun c-find-invalid-doc-markup (regexp limit)
   ;; Used to fontify invalid markup in doc comments after the correct
-  ;; ones have been fontified: Find the first occurence of REGEXP
+  ;; ones have been fontified: Find the first occurrence of REGEXP
   ;; between the point and LIMIT that only is fontified with
   ;; `c-doc-face-name'.  If a match is found then submatch 0 surrounds
   ;; the first char and t is returned, otherwise nil is returned.
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index ff92329f8be..1e5f1f506b3 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -1370,7 +1370,7 @@ non-delphi buffer. Set to nil in a delphi buffer.  To override, just do:
                      ;; Indent in from the expression.
                      (delphi-indent-of last-token delphi-indent-level))
 
-                    ;; No enclosing expression; use the previous statment's
+                    ;; No enclosing expression; use the previous statement's
                     ;; indent.
                     ((delphi-previous-indent-of token)))))
 
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 865cd153be1..4af331c5c29 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -643,7 +643,7 @@ It's flymake process filter."
             (flymake-report-status "" "")       ; PASSED
           (if (not flymake-check-was-interrupted)
               (flymake-report-fatal-status "CFGERR"
-                                           (format "Configuration error has occured while running %s" command))
+                                           (format "Configuration error has occurred while running %s" command))
             (flymake-report-status nil ""))) ; "STOPPED"
       (flymake-report-status (format "%d/%d" err-count warn-count) ""))))
 
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 9b1f1066d28..4be5cc4511e 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1814,7 +1814,7 @@ happens to be appropriate."
 Field names are wrapped in double quotes and equal signs are
 replaced with semicolons.
 
-If FIX-KEY is non-nil, strip all \"FIX-KEY=\" occurences from
+If FIX-KEY is non-nil, strip all \"FIX-KEY=\" occurrences from
 partial output.  This is used to get rid of useless keys in lists
 in MI messages, e.g.: [key=.., key=..].  -stack-list-frames and
 -break-info are examples of MI commands which issue such
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 6cdd0503757..e6228286a19 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -4607,7 +4607,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.")
 
 
 (defun idlwave-shorten-syntax (syntax name &optional class)
-  ;; From a list of syntax statments, shorten with %s and group with "or"
+  ;; From a list of syntax statements, shorten with %s and group with "or"
   (let ((case-fold-search t))
     (mapconcat
      (lambda (x)