# HG changeset patch
# User wenzelm
# Date 1368644022 -7200
# Node ID 9ebf2da69b293689a6bfdd3a91525022c9d573d0
# Parent  56dfc90a5c75f4cbfe3962506960c6f781df6ce6
uniform welcome -- actually visible on startup via Output.urgent_message;
tuned;

diff -r 56dfc90a5c75 -r 9ebf2da69b29 src/Pure/Tools/proof_general.ML
--- a/src/Pure/Tools/proof_general.ML	Wed May 15 20:45:27 2013 +0200
+++ b/src/Pure/Tools/proof_general.ML	Wed May 15 20:53:42 2013 +0200
@@ -26,8 +26,8 @@
   val preference_string: category -> string Unsynchronized.ref -> string -> string -> unit
   val preference_option: category -> string -> string -> string -> unit
   structure ThyLoad: sig val add_path: string -> unit end
+  val thm_deps: bool Unsynchronized.ref
   val init: unit -> unit
-  val thm_deps: bool Unsynchronized.ref
 end;
 
 structure ProofGeneral: PROOF_GENERAL =
@@ -326,17 +326,6 @@
   in () end;
 
 
-(* restart top-level loop (keeps most state information) *)
-
-val welcome = Output.urgent_message o Session.welcome;
-
-fun restart () =
- (sync_thy_loader ();
-  tell_clear_goals ();
-  tell_clear_response ();
-  Isar.init ();
-  welcome ());
-
 
 (** theorem dependencies **)
 
@@ -397,6 +386,47 @@
 
 
 
+(** startup **)
+
+val welcome = Output.urgent_message o Session.welcome;
+
+
+(* init *)
+
+val proof_general_emacsN = "ProofGeneralEmacs";
+
+val initialized = Unsynchronized.ref false;
+
+fun init () =
+  (if ! initialized then ()
+   else
+    (Output.add_mode Symbol.xsymbolsN Symbol.output Output.default_escape;
+     Output.add_mode proof_general_emacsN
+      Output.default_output Output.default_escape;
+     Markup.add_mode proof_general_emacsN YXML.output_markup;
+     setup_messages ();
+     setup_thy_loader ();
+     setup_present_hook ();
+     initialized := true);
+   sync_thy_loader ();
+   Unsynchronized.change print_mode (update (op =) proof_general_emacsN);
+   Secure.PG_setup ();
+   welcome ();
+   Isar.toplevel_loop TextIO.stdIn
+    {init = true, welcome = false, sync = true, secure = Secure.is_secure ()});
+
+
+(* restart *)
+
+fun restart () =
+ (sync_thy_loader ();
+  tell_clear_goals ();
+  tell_clear_response ();
+  Isar.init ();
+  welcome ());
+
+
+
 (** Isar command syntax **)
 
 val _ =
@@ -436,32 +466,5 @@
     (("ProofGeneral.inform_file_retracted", Keyword.control), Position.none) "(internal)"
     (Parse.name >> (fn file => Toplevel.imperative (fn () => inform_file_retracted file)));
 
-
-
-(** init **)
-
-val proof_general_emacsN = "ProofGeneralEmacs";
-
-val initialized = Unsynchronized.ref false;
-
-fun init () =
-  (if ! initialized then ()
-   else
-    (Output.add_mode Symbol.xsymbolsN Symbol.output Output.default_escape;
-     Output.add_mode proof_general_emacsN
-      Output.default_output Output.default_escape;
-     Markup.add_mode proof_general_emacsN YXML.output_markup;
-     setup_messages ();
-     setup_thy_loader ();
-     setup_present_hook ();
-     initialized := true);
-   sync_thy_loader ();
-   Unsynchronized.change print_mode (update (op =) proof_general_emacsN);
-   Secure.PG_setup ();
-   Isar.toplevel_loop TextIO.stdIn
-    {init = true, welcome = true, sync = true, secure = Secure.is_secure ()});
-
 end;
 
-
-