# HG changeset patch
# User haftmann
# Date 1245784059 -7200
# Node ID c8a590599cb595a185216569832da12a49472789
# Parent  d78e5cff9a9ff585dd08f9364ca513a265a9a1a3# Parent  496c86f5f9e93870af61d284fe90b9897585cf69
merged

diff -r 496c86f5f9e9 -r c8a590599cb5 etc/symbols
--- a/etc/symbols	Tue Jun 23 21:05:59 2009 +0200
+++ b/etc/symbols	Tue Jun 23 21:07:39 2009 +0200
@@ -207,7 +207,7 @@
 \<bottom>               code: 0x0022a5  font: Isabelle
 \<top>                  code: 0x0022a4  font: Isabelle
 \<and>                  code: 0x002227  font: Isabelle  abbrev: /\
-\<And>                  code: 0x0022c0  font: Isabelle  abbreb: !!
+\<And>                  code: 0x0022c0  font: Isabelle  abbrev: !!
 \<or>                   code: 0x002228  font: Isabelle  abbrev: \/
 \<Or>                   code: 0x0022c1  font: Isabelle  abbrev: ??
 \<forall>               code: 0x002200  font: Isabelle  abbrev: !
diff -r 496c86f5f9e9 -r c8a590599cb5 src/Pure/Thy/completion.scala
--- a/src/Pure/Thy/completion.scala	Tue Jun 23 21:05:59 2009 +0200
+++ b/src/Pure/Thy/completion.scala	Tue Jun 23 21:07:39 2009 +0200
@@ -68,11 +68,11 @@
 {
   /* representation */
 
-  val words_lex = Scan.Lexicon()
-  val words_map = Map[String, String]()
+  protected val words_lex = Scan.Lexicon()
+  protected val words_map = Map[String, String]()
 
-  val abbrevs_lex = Scan.Lexicon()
-  val abbrevs_map = Map[String, (String, String)]()
+  protected val abbrevs_lex = Scan.Lexicon()
+  protected val abbrevs_map = Map[String, (String, String)]()
 
 
   /* adding stuff */