[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99903: Font lock fix for batch mode (Bug#5719).

[Chong Yidong]

------------------------------------------------------------
revno: 99903
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-06-27 14:43:34 -0400
message:
  Font lock fix for batch mode (Bug#5719).
  * generic-x.el (bat-generic-mode): Fix regexp for command line
  switches (Bug#5719).
modified:
  lisp/ChangeLog
  lisp/generic-x.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-27 18:24:42 +0000
+++ b/lisp/ChangeLog    2010-06-27 18:43:34 +0000
@@ -1,7 +1,12 @@
+2010-06-27  Oleksandr Gavenko  <address@hidden>  (tiny change)
+
+       * generic-x.el (bat-generic-mode): Fix regexp for command line
+       switches (Bug#5719).
+
 2010-06-27  Masatake YAMATO  <address@hidden>
 
-       * 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  <address@hidden>  (tiny change)
 

=== modified file 'lisp/generic-x.el'
--- a/lisp/generic-x.el 2010-01-13 08:35:10 +0000
+++ b/lisp/generic-x.el 2010-06-27 18:43:34 +0000
@@ -508,8 +508,7 @@
      '("^[ \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))