# HG changeset patch
# User ballarin
# Date 1229090535 -3600
# Node ID 089499f104d37bd7b9337a29779553f8d3cf2617
# Parent  fcc9606fe14139c2ad95b58f66a1168cce006919
Merged.

diff -r fcc9606fe141 -r 089499f104d3 src/HOL/ex/LocaleTest2.thy
--- a/src/HOL/ex/LocaleTest2.thy	Fri Dec 12 14:26:35 2008 +0100
+++ b/src/HOL/ex/LocaleTest2.thy	Fri Dec 12 15:02:15 2008 +0100
@@ -1,5 +1,4 @@
 (*  Title:      HOL/ex/LocaleTest2.thy
-    ID:         $Id$
     Author:     Clemens Ballarin
     Copyright (c) 2007 by Clemens Ballarin
 
diff -r fcc9606fe141 -r 089499f104d3 src/Pure/Isar/subclass.ML
--- a/src/Pure/Isar/subclass.ML	Fri Dec 12 14:26:35 2008 +0100
+++ b/src/Pure/Isar/subclass.ML	Fri Dec 12 15:02:15 2008 +0100
@@ -1,5 +1,4 @@
 (*  Title:      Pure/Isar/subclass.ML
-    ID:         $Id$
     Author:     Florian Haftmann, TU Muenchen
 
 User interface for proving subclass relationship between type classes.
@@ -22,7 +21,7 @@
     val thy = ProofContext.theory_of lthy;
     val sup = prep_class thy raw_sup;
     val sub = case TheoryTarget.peek lthy
-     of {is_class = false, ...} => error "No class context"
+     of {is_class = false, ...} => error "Not a class context"
       | {target, ...} => target;
     val _ = if Sign.subsort thy ([sup], [sub])
       then error ("Class " ^ Syntax.string_of_sort lthy [sup]