diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-22 11:36:45 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-22 11:36:45 -0800 |
| commit | 7c82f3e23e37cc848a38b1f8be7149fd672a6393 (patch) | |
| tree | e721d1d5361deeb04278045331d74e9c7f8b00f0 /lisp/progmodes/js.el | |
| parent | 80094035aff85d827e1ef65627974b34ad9fa8df (diff) | |
| parent | bd2a4b24c4a591240862704737b5bc696ff67cbf (diff) | |
| download | emacs-7c82f3e23e37cc848a38b1f8be7149fd672a6393.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/progmodes/js.el')
| -rw-r--r-- | lisp/progmodes/js.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 27d3dd1ae40..346a77b5810 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1659,12 +1659,11 @@ This performs fontification according to `js--class-styles'." ;; below. (eval-and-compile (defconst js--regexp-literal - "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\/\\|[^/*]\\)\\(?:\\\\/\\|[^/]\\)*\\(/\\)" + "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\.\\|[^/*\\]\\)\\(?:\\\\.\\|[^/\\]\\)*\\(/\\)" "Regexp matching a JavaScript regular expression literal. Match groups 1 and 2 are the characters forming the beginning and end of the literal.")) - (defconst js-syntax-propertize-function (syntax-propertize-rules ;; We want to match regular expressions only at the beginning of |