From: Deniz Dogan Date: Tue, 28 Jun 2011 11:37:05 +0000 (+0200) Subject: * textmodes/css-mode.el (css-proprietary-nmstart-re): Use `regexp-opt'. X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~352 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec49bd31eafd898632fd864758cf954d2f90a44e;p=emacs.git * textmodes/css-mode.el (css-proprietary-nmstart-re): Use `regexp-opt'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4ab5fdaab76..67ee29cd314 100644 --- 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 diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 0a8f0b303c9..d98aa183f21 100644 --- 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))