From 840ea4f4f5b1baa4cefa02995d25bfd66f85cea6 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 15 Apr 2010 22:15:43 -0400
Subject: [PATCH] simplify [g]racket startup banner

---
 collects/mred/private/repl.ss | 14 +++++++++-----
 src/mred/mred.cxx             |  4 ++--
 src/mred/mred.h               |  5 +++--
 src/mzscheme/src/string.c     |  9 +++++----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/collects/mred/private/repl.ss b/collects/mred/private/repl.ss
index dcc707fc4d..d68e04c989 100644
--- a/collects/mred/private/repl.ss
+++ b/collects/mred/private/repl.ss
@@ -50,11 +50,15 @@
 	  (super-init)
 	  (let ([s (last-position)]
 		[m (regexp-match #rx"^(.*), (Copyright.*)$" (banner))])
-	    (insert (format "~a." (cadr m)))
-	    (let ([e (last-position)])
-	      (insert #\newline)
-	      (change-style (send (make-object wx:style-delta% 'change-bold) set-delta-foreground "BLUE") s e))
-	    (output (caddr m)))
+            (insert (if m
+                        (format "~a." (cadr m))
+                        (let ([b (banner)])
+                          (substring b 0 (sub1 (string-length b))))))
+            (let ([e (last-position)])
+              (insert #\newline)
+              (change-style (send (make-object wx:style-delta% 'change-bold) set-delta-foreground "BLUE") s e))
+            (when m
+              (output (caddr m))))
 	  (insert "This is a simple window for evaluating Racket expressions.") (insert #\newline)
 	  (let ([s (last-position)])
 	    (insert "Quit now and run DrRacket to get a better window.")
diff --git a/src/mred/mred.cxx b/src/mred/mred.cxx
index 9ba499a623..94f8b6f6aa 100644
--- a/src/mred/mred.cxx
+++ b/src/mred/mred.cxx
@@ -2960,11 +2960,11 @@ void wxDoMainLoop()
 
 static Scheme_Env *setup_basic_env()
 {
+  scheme_set_banner(BANNER);
+
   wxREGGLOB(global_env);
   global_env = scheme_basic_env();
 
-  scheme_set_banner(BANNER);
-
 #ifdef DANGER_ALARM
   {
     DangerThreadTimer *t = new WXGC_PTRS DangerThreadTimer();
diff --git a/src/mred/mred.h b/src/mred/mred.h
index 5ba3ea74e0..5d28ba8cbc 100644
--- a/src/mred/mred.h
+++ b/src/mred/mred.h
@@ -179,7 +179,8 @@ MRED_EXTERN void mred_set_run_from_cmd_line(MrEd_Run_From_Cmd_Line_Proc);
 # include "../mzscheme/src/schvers.h"
 
 #ifdef MZ_PRECISE_GC
-# define mrVERSION_SUFFIX " [3m]"
+/* don't print " [3m]", which is the default: */
+# define mrVERSION_SUFFIX ""
 #else
 # ifdef USE_SENORA_GC
 #  define mrVERSION_SUFFIX " [cgc~]"
@@ -187,7 +188,7 @@ MRED_EXTERN void mred_set_run_from_cmd_line(MrEd_Run_From_Cmd_Line_Proc);
 #  define mrVERSION_SUFFIX " [cgc]"
 # endif
 #endif
-#define BANNER "GRacket v" MZSCHEME_VERSION mrVERSION_SUFFIX ", Copyright (c) 2004-2010 PLT Scheme Inc.\n"
+#define BANNER "Welcome to GRacket v" MZSCHEME_VERSION mrVERSION_SUFFIX ".\n"
 
 #ifndef WCONSOLE_STDIO
 # if defined(wx_msw)
diff --git a/src/mzscheme/src/string.c b/src/mzscheme/src/string.c
index 284074383a..c3afb9c51b 100644
--- a/src/mzscheme/src/string.c
+++ b/src/mzscheme/src/string.c
@@ -1931,7 +1931,8 @@ char *scheme_version(void)
 }
 
 #ifdef MZ_PRECISE_GC
-# define VERSION_SUFFIX " [3m]"
+/* don't print " [3m]", which is the default: */
+# define VERSION_SUFFIX ""
 #else
 # ifdef USE_SENORA_GC
 #  define VERSION_SUFFIX " [cgc~]"
@@ -1945,9 +1946,9 @@ char *scheme_banner(void)
   if (embedding_banner)
     return embedding_banner;
   else
-    return "Welcome to Racket"
-      " v" MZSCHEME_VERSION VERSION_SUFFIX
-      ", Copyright (c) 2004-2010 PLT Scheme Inc.\n";
+    return ("Welcome to Racket"
+            " v" MZSCHEME_VERSION VERSION_SUFFIX
+            ".\n");
 }
 
 void scheme_set_banner(char *s)