* textmodes/css-mode.el (css-proprietary-nmstart-re): Use `regexp-opt'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ab5fdaab762cbe02ab0f53d8225495a089b865c..67ee29cd31450abda138772ea2452ab0ed8b0704 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped
        selectors (Bug#5732).
+       (css-proprietary-nmstart-re): Use `regexp-opt'.
 
 2011-06-27  Jari Aalto  <jari.aalto@cante.net>
 

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 0a8f0b303c96ee5f507c1e4f62888c796213c063..d98aa183f212d6a145c5ffba44a29899dd65fd0d 100644 (file)
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -213,7 +213,7 @@
 (defconst css-nmstart-re (concat "\\(?:[[:alpha:]]\\|" css-escapes-re "\\)"))
 (defconst css-ident-re (concat css-nmstart-re css-nmchar-re "*"))
 (defconst css-proprietary-nmstart-re ;; Vendor-specific properties.
-  "[-_]\\(?:ms\\|moz\\|o\\|webkit\\|khtml\\)-")
+  (concat "[-_]" (regexp-opt '("ms" "moz" "o" "khtml" "webkit")) "-"))
 (defconst css-name-re (concat css-nmchar-re "+"))
 
 (defface css-selector '((t :inherit font-lock-function-name-face))