Font lock fix for batch mode (Bug#5719).

* generic-x.el (bat-generic-mode): Fix regexp for command line
switches (Bug#5719).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83388723a23ec6cacca3df199bd1737f13f0be18..5bda792cfc00545d8a46eca7c006f5f671647867 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
+2010-06-27  Oleksandr Gavenko  <gavenkoa@gmail.com>  (tiny change)
+
+       * generic-x.el (bat-generic-mode): Fix regexp for command line
+       switches (Bug#5719).
+
 2010-06-27  Masatake YAMATO  <yamato@redhat.com>
 
-       * htmlfontify.el (hfy-face-attr-for-class): Use `append' instead
-       of `nconc' (Bug#6239).
+       * htmlfontify.el (hfy-face-attr-for-class): Use append instead
+       of nconc to avoid pure storage error (Bug#6239).
 
 2010-06-27  Christoph  <cschol2112@googlemail.com>  (tiny change)
 

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index a96ab5cbbe91f86856f6e065235f9c3c031f193e..0083989c75ab42590e7555eee4e4b217de5862f6 100644 (file)
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -508,8 +508,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
      '("^[ \t]*\\(:\\sw+\\)"         1 font-lock-function-name-face t)
      '("\\(%\\sw+%\\)"               1 font-lock-variable-name-face t)
      '("\\(%[0-9]\\)"                1 font-lock-variable-name-face t)
-     '("\\(/[^/ \"\t\n]+\\)"         1 font-lock-type-face)
-     '("[\t ]+\\([+-][^\t\n\" ]+\\)" 1 font-lock-type-face)
+     '("[\t ]+\\([+-/][^\t\n\" ]+\\)" 1 font-lock-type-face)
      '("[ \t\n|]\\<\\([gG][oO][tT][oO]\\)\\>[ \t]*\\(\\sw+\\)?"
        (1 font-lock-keyword-face)
        (2 font-lock-function-name-face nil t))