aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorDeniz Dogan2011-06-28 13:37:05 +0200
committerDeniz Dogan2011-06-28 13:37:05 +0200
commitec49bd31eafd898632fd864758cf954d2f90a44e (patch)
tree9df4fb9e771698b33cd581de946dae3e2da3ade7 /lisp
parentad85fe1f1b0719e4e33596a0eb60aa3f0fca74fe (diff)
downloademacs-ec49bd31eafd898632fd864758cf954d2f90a44e.tar.gz
emacs-ec49bd31eafd898632fd864758cf954d2f90a44e.zip
* textmodes/css-mode.el (css-proprietary-nmstart-re): Use `regexp-opt'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/textmodes/css-mode.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ab5fdaab76..67ee29cd314 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped 3 * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped
4 selectors (Bug#5732). 4 selectors (Bug#5732).
5 (css-proprietary-nmstart-re): Use `regexp-opt'.
5 6
62011-06-27 Jari Aalto <jari.aalto@cante.net> 72011-06-27 Jari Aalto <jari.aalto@cante.net>
7 8
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 @@
213(defconst css-nmstart-re (concat "\\(?:[[:alpha:]]\\|" css-escapes-re "\\)")) 213(defconst css-nmstart-re (concat "\\(?:[[:alpha:]]\\|" css-escapes-re "\\)"))
214(defconst css-ident-re (concat css-nmstart-re css-nmchar-re "*")) 214(defconst css-ident-re (concat css-nmstart-re css-nmchar-re "*"))
215(defconst css-proprietary-nmstart-re ;; Vendor-specific properties. 215(defconst css-proprietary-nmstart-re ;; Vendor-specific properties.
216 "[-_]\\(?:ms\\|moz\\|o\\|webkit\\|khtml\\)-") 216 (concat "[-_]" (regexp-opt '("ms" "moz" "o" "khtml" "webkit")) "-"))
217(defconst css-name-re (concat css-nmchar-re "+")) 217(defconst css-name-re (concat css-nmchar-re "+"))
218 218
219(defface css-selector '((t :inherit font-lock-function-name-face)) 219(defface css-selector '((t :inherit font-lock-function-name-face))