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

Merge from emacs-23
author Glenn Morris <rgm@gnu.org>
date Sat, 22 Jan 2011 11:36:45 -0800
parents 417b1e4d63cd f7f90410cc52
children
comparison
equal deleted inserted replaced
112416:f792eb37d0ca 112425:9f7614f1a892
1657 ;; XXX: Javascript can continue a regexp literal across lines so long 1657 ;; XXX: Javascript can continue a regexp literal across lines so long
1658 ;; as the newline is escaped with \. Account for that in the regexp 1658 ;; as the newline is escaped with \. Account for that in the regexp
1659 ;; below. 1659 ;; below.
1660 (eval-and-compile 1660 (eval-and-compile
1661 (defconst js--regexp-literal 1661 (defconst js--regexp-literal
1662 "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\/\\|[^/*]\\)\\(?:\\\\/\\|[^/]\\)*\\(/\\)" 1662 "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\.\\|[^/*\\]\\)\\(?:\\\\.\\|[^/\\]\\)*\\(/\\)"
1663 "Regexp matching a JavaScript regular expression literal. 1663 "Regexp matching a JavaScript regular expression literal.
1664 Match groups 1 and 2 are the characters forming the beginning and 1664 Match groups 1 and 2 are the characters forming the beginning and
1665 end of the literal.")) 1665 end of the literal."))
1666
1667 1666
1668 (defconst js-syntax-propertize-function 1667 (defconst js-syntax-propertize-function
1669 (syntax-propertize-rules 1668 (syntax-propertize-rules
1670 ;; We want to match regular expressions only at the beginning of 1669 ;; We want to match regular expressions only at the beginning of
1671 ;; expressions. 1670 ;; expressions.