aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-06-27 14:43:34 -0400
committerChong Yidong2010-06-27 14:43:34 -0400
commitdfc6544ca01f14504a1b2eb8df57691eee5f33b1 (patch)
treec81d1d0bb02dc6eb2ca1bbd6c0baea6d9b4a4cda
parentb7d4de51858a4e320aa3c6957f3a7651251113d5 (diff)
downloademacs-dfc6544ca01f14504a1b2eb8df57691eee5f33b1.tar.gz
emacs-dfc6544ca01f14504a1b2eb8df57691eee5f33b1.zip
Font lock fix for batch mode (Bug#5719).
* generic-x.el (bat-generic-mode): Fix regexp for command line switches (Bug#5719).
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/generic-x.el3
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83388723a23..5bda792cfc0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
12010-06-27 Oleksandr Gavenko <gavenkoa@gmail.com> (tiny change)
2
3 * generic-x.el (bat-generic-mode): Fix regexp for command line
4 switches (Bug#5719).
5
12010-06-27 Masatake YAMATO <yamato@redhat.com> 62010-06-27 Masatake YAMATO <yamato@redhat.com>
2 7
3 * htmlfontify.el (hfy-face-attr-for-class): Use `append' instead 8 * htmlfontify.el (hfy-face-attr-for-class): Use append instead
4 of `nconc' (Bug#6239). 9 of nconc to avoid pure storage error (Bug#6239).
5 10
62010-06-27 Christoph <cschol2112@googlemail.com> (tiny change) 112010-06-27 Christoph <cschol2112@googlemail.com> (tiny change)
7 12
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index a96ab5cbbe9..0083989c75a 100644
--- 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'."
508 '("^[ \t]*\\(:\\sw+\\)" 1 font-lock-function-name-face t) 508 '("^[ \t]*\\(:\\sw+\\)" 1 font-lock-function-name-face t)
509 '("\\(%\\sw+%\\)" 1 font-lock-variable-name-face t) 509 '("\\(%\\sw+%\\)" 1 font-lock-variable-name-face t)
510 '("\\(%[0-9]\\)" 1 font-lock-variable-name-face t) 510 '("\\(%[0-9]\\)" 1 font-lock-variable-name-face t)
511 '("\\(/[^/ \"\t\n]+\\)" 1 font-lock-type-face) 511 '("[\t ]+\\([+-/][^\t\n\" ]+\\)" 1 font-lock-type-face)
512 '("[\t ]+\\([+-][^\t\n\" ]+\\)" 1 font-lock-type-face)
513 '("[ \t\n|]\\<\\([gG][oO][tT][oO]\\)\\>[ \t]*\\(\\sw+\\)?" 512 '("[ \t\n|]\\<\\([gG][oO][tT][oO]\\)\\>[ \t]*\\(\\sw+\\)?"
514 (1 font-lock-keyword-face) 513 (1 font-lock-keyword-face)
515 (2 font-lock-function-name-face nil t)) 514 (2 font-lock-function-name-face nil t))