[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100387: compile.el fix for bug#7812

[Glenn Morris]

------------------------------------------------------------
revno: 100387
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Thu 2011-01-20 21:04:45 -0800
message:
  compile.el fix for bug#7812
  
  * lisp/progmodes/compile.el (compilation-error-regexp-alist):
  Fix custom type.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-17 21:42:23 +0000
+++ b/lisp/ChangeLog    2011-01-21 05:04:45 +0000
@@ -1,3 +1,8 @@
+2011-01-21  Glenn Morris  <address@hidden>
+
+       * progmodes/compile.el (compilation-error-regexp-alist):
+       Fix custom type.  (Bug#7812)
+
 2011-01-17  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the
@@ -12487,4 +12492,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-01-02 23:50:46 +0000
+++ b/lisp/progmodes/compile.el 2011-01-21 05:04:45 +0000
@@ -499,10 +499,8 @@
 
 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)
@@ -2389,5 +2387,4 @@
 
 (provide 'compile)
 
-;; arch-tag: 12465727-7382-4f72-b234-79855a00dd8c
 ;;; compile.el ends here