(bat-generic-mode): "::"-style comments don't

need to begin with "-".  Fix the font-lock definitions of ON/OFF
after BREAK/VERIFY.  Remove built-in commands like CALL and ECHO
from the list of keywords.  Add DO to the list of keywords.

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 8eb5aa16ec08610554bbb7bf54d4459901a3c0ed..fb723553d5877981c7a73a3f91d0392c1de3bafc 100644 (file)
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -301,11 +301,11 @@ you must reload generic-x to enable the specified modes."
      ;; Make this one first in the list, otherwise comments will
      ;; be over-written by other variables
      (list "^[@ \t]*\\([rR][eE][mM][^\n\r]*\\)" 1 'font-lock-comment-face t)
-     (list "^[ \t]*\\(::-.*\\)"                        1 'font-lock-comment-face t)
+     (list "^[ \t]*\\(::.*\\)"                 1 'font-lock-comment-face t)
      (list
       "^[@ \t]*\\([bB][rR][eE][aA][kK]\\|[vV][eE][rR][iI][fF][yY]\\)[ \t]+\\([oO]\\([nN]\\|[fF][fF]\\)\\)"
       '(1 font-lock-builtin-face)
-      '(2 font-lock-constant-face 'append t))
+      '(2 font-lock-constant-face t t))
      ;; Any text (except ON/OFF) following ECHO is a string.
      (list
       "^[@ \t]*\\([eE][cC][hH][oO]\\)[ \t]+\\(\\([oO]\\([nN]\\|[fF][fF]\\)\\)\\|\\([^>|\r\n]+\\)\\)"
@@ -319,15 +319,8 @@ you must reload generic-x to enable the specified modes."
      ;; case-insensitive
      (generic-make-keywords-list
       (list
-       "call"
-       "echo"
        "for"
        "if"
-       "path"
-       "pause"
-       "prompt"
-       "set"
-       "start"
        )
       'font-lock-keyword-face "^[@ \t]*")
      ;; These keywords can be anywhere on a line
@@ -335,6 +328,7 @@ you must reload generic-x to enable the specified modes."
      ;; case-insensitive
      (generic-make-keywords-list
       (list
+       "do"
        "exist"
        "errorlevel"
        "goto"