merged.

--- a/src/Pure/General/markup.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/General/markup.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/General/markup.scala
-    ID:         $Id$
     Author:     Makarius
 
 Common markup elements.

--- a/src/Pure/General/position.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/General/position.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/General/position.scala
-    ID:         $Id$
     Author:     Makarius
 
 Position properties.

--- a/src/Pure/General/symbol.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/General/symbol.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/General/symbol.scala
-    ID:         $Id$
     Author:     Makarius
 
 Detecting and recoding Isabelle symbols.

--- a/src/Pure/General/xml.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/General/xml.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/General/xml.scala
-    ID:         $Id$
     Author:     Makarius
 
 Simple XML tree values.

--- a/src/Pure/General/yxml.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/General/yxml.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/General/yxml.scala
-    ID:         $Id$
     Author:     Makarius
 
 Efficient text representation of XML trees.

--- a/src/Pure/Isar/isar.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/Isar/isar.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,7 +1,5 @@
 /*  Title:      Pure/Isar/isar.scala
-    ID:         $Id$
     Author:     Makarius
-    Options:    :folding=explicit:collapseFolds=1:
 
 Isar toplevel editor model.
 */

--- a/src/Pure/Thy/thy_header.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/Thy/thy_header.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/Thy/thy_header.scala
-    ID:         $Id$
     Author:     Makarius
 
 Theory header keywords.

--- a/src/Pure/Tools/isabelle_process.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/Tools/isabelle_process.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/Tools/isabelle_process.ML
-    ID:         $Id$
     Author:     Makarius
     Options:    :folding=explicit:collapseFolds=1:
 

--- a/src/Pure/Tools/isabelle_syntax.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/Tools/isabelle_syntax.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/Tools/isabelle_syntax.scala
-    ID:         $Id$
     Author:     Makarius
 
 Isabelle outer syntax.

--- a/src/Pure/Tools/isabelle_system.scala	Thu Dec 18 11:00:13 2008 -0800
+++ b/src/Pure/Tools/isabelle_system.scala	Fri Dec 19 16:16:10 2008 -0800
@@ -1,5 +1,4 @@
 /*  Title:      Pure/Tools/isabelle_system.scala
-    ID:         $Id$
     Author:     Makarius
 
 Isabelle system support -- basic Cygwin/Posix compatibility.