When compiling, require compare-w and skeleton

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

diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index c248227190b7ed4763220a2dfddd66fafbc90c85..df74b74d73a7c9c31d11b5d8558e6c987ed3a62e 100644 (file)
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc.
 
-;; Authors: Rolf Ebert      <ebert@inf.enst.fr>
+;; Authors: Rolf Ebert      <re@waporo.muc.de>
 ;;          Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;; Keywords: languages oop ada
 ;; Rolf Ebert's version: 2.27
@@ -3022,9 +3022,10 @@ This works by two steps:
             (progn
               (re-search-backward "--" nil 1)
               (goto-char (match-beginning 0)))
-          (progn
-            (forward-line 1)
-            (beginning-of-line))))
+         (forward-line 1)
+         ;; Used to have (beginning-of-line) here,
+         ;; but that caused trouble at end of buffer with no newline.
+         ))
        ;;
        ;; found in string => skip it
        ;;
@@ -3797,10 +3798,10 @@ If that is the case remember the name of that function."
     (list (concat "\\<\\(goto\\|raise\\|use\\|with\\)\\>" ; "when" removed
                   ; "[ \t]*\\(\\sw+\\(\\.\\sw*\\)*\\)?") ; RE
                   "[ \t]*\\([a-zA-Z0-9_\\.\\|, ]+\\)\\W")
-          '(1 font-lock-keyword-face) '(2 font-lock-reference-face nil t))
+          '(1 font-lock-keyword-face) '(2 font-lock-constant-face nil t))
     ;;
     ;; Goto tags.
-    '("<<\\(\\sw+\\)>>" 1 font-lock-reference-face)
+    '("<<\\(\\sw+\\)>>" 1 font-lock-constant-face)
     ))
   "Gaudy level highlighting for Ada mode.")