Merge from emacs-23

2 files changed, 3 insertions, 6 deletions

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 25429801298..0c9431d1d9d 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -508,10 +508,8 @@ matched by the whole REGEXP becomes the hyperlink.
 
 Additional HIGHLIGHTs as described under `font-lock-keywords' can
 be added."
-  :type `(set :menu-tag "Pick"
-              ,@(mapcar (lambda (elt)
-                          (list 'const (car elt)))
-                        compilation-error-regexp-alist-alist))
+  :type '(repeat (choice (symbol :tag "Predefined symbol")
+                         (sexp :tag "Error specification")))
   :link `(file-link :tag "example file"
                     ,(expand-file-name "compilation.txt" data-directory))
   :group 'compilation)
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