[Emacs-diffs] emacs-26 51cbd85: Improve syntax highlighting in bat-mode

[Eli Zaretskii]

branch: emacs-26
commit 51cbd85454f6febb635b806dd759c4d054a43552
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Improve syntax highlighting in bat-mode
    
    * lisp/progmodes/bat-mode.el (bat-font-lock-keywords): Improve
    font-locking of environment variables.  Suggested by Achim Gratz
    <address@hidden>.  (Bug#28311)  (Bug#18405)
---
 lisp/progmodes/bat-mode.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el
index f4852fe..e06b8e8 100644
--- a/lisp/progmodes/bat-mode.el
+++ b/lisp/progmodes/bat-mode.el
@@ -84,11 +84,11 @@
          . 'bat-label-face)
         ("\\_<\\(defined\\|set\\)\\_>[ \t]*\\(\\(\\sw\\|\\s_\\)+\\)"
          (2 font-lock-variable-name-face))
-        ("%\\(\\(\\sw\\|\\s_\\)+\\)%"
+        ("%\\([^% \n]+\\)%?"
          (1 font-lock-variable-name-face))
-        ("!\\(\\(\\sw\\|\\s_\\)+\\)!"  ; delayed-expansion !variable!
+        ("!\\([^!% \n]+\\)!?"  ; delayed-expansion !variable!
          (1 font-lock-variable-name-face))
-        
("%%\\(?:~[adfnpstxz]*\\(?:\\$\\(\\(?:\\sw\\|\\s_\\)+\\):\\)?\\)?\\([]!#$&-:?-[_-{}~]\\)"
+        
("%%\\(?:~[adfnpstxz]*\\(?:\\$\\(\\(?:\\sw\\|\\s_\\|_\\)+\\):\\)?\\)?\\([]!#$&-:?-[_-{}~]\\)"
          (1 font-lock-variable-name-face nil t) ; PATH expansion
          (2 font-lock-variable-name-face)) ; iteration variable or positional 
parameter
         ("[ =][-/]+\\(\\w+\\)"