Commit 774b98f3 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(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.
parent 04f12e57
...@@ -301,11 +301,11 @@ you must reload generic-x to enable the specified modes." ...@@ -301,11 +301,11 @@ you must reload generic-x to enable the specified modes."
;; Make this one first in the list, otherwise comments will ;; Make this one first in the list, otherwise comments will
;; be over-written by other variables ;; be over-written by other variables
(list "^[@ \t]*\\([rR][eE][mM][^\n\r]*\\)" 1 'font-lock-comment-face t) (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 (list
"^[@ \t]*\\([bB][rR][eE][aA][kK]\\|[vV][eE][rR][iI][fF][yY]\\)[ \t]+\\([oO]\\([nN]\\|[fF][fF]\\)\\)" "^[@ \t]*\\([bB][rR][eE][aA][kK]\\|[vV][eE][rR][iI][fF][yY]\\)[ \t]+\\([oO]\\([nN]\\|[fF][fF]\\)\\)"
'(1 font-lock-builtin-face) '(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. ;; Any text (except ON/OFF) following ECHO is a string.
(list (list
"^[@ \t]*\\([eE][cC][hH][oO]\\)[ \t]+\\(\\([oO]\\([nN]\\|[fF][fF]\\)\\)\\|\\([^>|\r\n]+\\)\\)" "^[@ \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." ...@@ -319,15 +319,8 @@ you must reload generic-x to enable the specified modes."
;; case-insensitive ;; case-insensitive
(generic-make-keywords-list (generic-make-keywords-list
(list (list
"call"
"echo"
"for" "for"
"if" "if"
"path"
"pause"
"prompt"
"set"
"start"
) )
'font-lock-keyword-face "^[@ \t]*") 'font-lock-keyword-face "^[@ \t]*")
;; These keywords can be anywhere on a line ;; These keywords can be anywhere on a line
...@@ -335,6 +328,7 @@ you must reload generic-x to enable the specified modes." ...@@ -335,6 +328,7 @@ you must reload generic-x to enable the specified modes."
;; case-insensitive ;; case-insensitive
(generic-make-keywords-list (generic-make-keywords-list
(list (list
"do"
"exist" "exist"
"errorlevel" "errorlevel"
"goto" "goto"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment