Merge from emacs-23

[bpt/emacs.git] / lisp / progmodes / compile.el

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3b4dba3..0c9431d 100644 (file)
--- 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)
@@ -2431,5 +2429,4 @@ The file-structure looks like this:
 
 (provide 'compile)
 
-;; arch-tag: 12465727-7382-4f72-b234-79855a00dd8c
 ;;; compile.el ends here