Mercurial > emacs

diff lisp/progmodes/js.el @ 112425:9f7614f1a892

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs-23
author Glenn Morris <rgm@gnu.org>
date Sat, 22 Jan 2011 11:36:45 -0800
parents 417b1e4d63cd f7f90410cc52
children
line wrap: on
line diff
--- a/lisp/progmodes/js.el	Sat Jan 22 17:21:38 2011 +0100
+++ b/lisp/progmodes/js.el	Sat Jan 22 11:36:45 2011 -0800
@@ -1659,12 +1659,11 @@
 ;; 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