0.8.6.22:

	LESS TEXT: quieter startup banner and debug prompt mostly
		as suggested by Nikodemus Siivola and Dan Barlow
		on sbcl-devel
	really updating FASL-FILE-VERSION (as attempted in my last
		checkin) this time for sure

diff --git a/src/code/debug.lisp b/src/code/debug.lisp
index 74fa1a9..69a135c 100644 (file)
--- a/src/code/debug.lisp
+++ b/src/code/debug.lisp
@@ -740,7 +740,7 @@ reset to ~S."
        ;; regardless of what the debugger does afterwards.)
        (handler-case
           (format *error-output*
-                  "~2&~@<debugger invoked on condition of type ~S in thread ~A: ~
+                  "~2&~@<debugger invoked on a ~S in thread ~A: ~
                     ~2I~_~A~:>~%"
                   (type-of *debug-condition*)
                   (sb!thread:current-thread-id)
@@ -775,34 +775,29 @@ reset to ~S."
        ;; been converted to behave this way. -- WHN 2000-11-16)
 
        (unwind-protect
-       (let (;; FIXME: Rebinding *STANDARD-OUTPUT* here seems wrong,
-            ;; violating the principle of least surprise, and making
-            ;; it impossible for the user to do reasonable things
-            ;; like using PRINT at the debugger prompt to send output
-            ;; to the program's ordinary (possibly
-            ;; redirected-to-a-file) *STANDARD-OUTPUT*. (CMU CL
-            ;; used to rebind *STANDARD-INPUT* here too, but that's
-            ;; been fixed already.)
-            (*standard-output* *debug-io*)
-            ;; This seems reasonable: e.g. if the user has redirected
-            ;; *ERROR-OUTPUT* to some log file, it's probably wrong
-            ;; to send errors which occur in interactive debugging to
-            ;; that file, and right to send them to *DEBUG-IO*.
-            (*error-output* *debug-io*))
-        (unless (typep condition 'step-condition)
-          (when *debug-beginner-help-p*
-            (format *debug-io*
-                    "~%~@<Within the debugger, you can type HELP for help. ~
-                      At any command prompt (within the debugger or not) you ~
-                      can type (SB-EXT:QUIT) to terminate the SBCL ~
-                      executable. The condition which caused the debugger to ~
-                      be entered is bound to ~S. You can suppress this ~
-                      message by clearing ~S.~:@>~2%"
-                    '*debug-condition*
-                    '*debug-beginner-help-p*))
-          (show-restarts *debug-restarts* *debug-io*))
+           (let (;; FIXME: Rebinding *STANDARD-OUTPUT* here seems wrong,
+                 ;; violating the principle of least surprise, and making
+                 ;; it impossible for the user to do reasonable things
+                 ;; like using PRINT at the debugger prompt to send output
+                 ;; to the program's ordinary (possibly
+                 ;; redirected-to-a-file) *STANDARD-OUTPUT*. (CMU CL
+                 ;; used to rebind *STANDARD-INPUT* here too, but that's
+                 ;; been fixed already.)
+                 (*standard-output* *debug-io*)
+                 ;; This seems reasonable: e.g. if the user has redirected
+                 ;; *ERROR-OUTPUT* to some log file, it's probably wrong
+                 ;; to send errors which occur in interactive debugging to
+                 ;; that file, and right to send them to *DEBUG-IO*.
+                 (*error-output* *debug-io*))
+             (unless (typep condition 'step-condition)
+               (when *debug-beginner-help-p*
+                 (format *debug-io*
+                         "~%~@<You can type HELP for debugger help, or ~
+                                (SB-EXT:QUIT) to exit from SBCL.~:@>~2%"))
+               (show-restarts *debug-restarts* *debug-io*))
              (internal-debug))
-        (when background-p (sb!thread::release-foreground)))))))
+        (when background-p
+          (sb!thread::release-foreground)))))))
 
 ;;; this function is for use in *INVOKE-DEBUGGER-HOOK* when ordinary
 ;;; ANSI behavior has been suppressed by command-line

diff --git a/src/code/early-fasl.lisp b/src/code/early-fasl.lisp
index 8719750..7b565eb 100644 (file)
--- a/src/code/early-fasl.lisp
+++ b/src/code/early-fasl.lisp
@@ -76,7 +76,7 @@
 ;;; versions which break binary compatibility. But it certainly should
 ;;; be incremented for release versions which break binary
 ;;; compatibility.
-(def!constant +fasl-file-version+ 46)
+(def!constant +fasl-file-version+ 47)
 ;;; (record of versions before 2003 deleted in 2003-04-26/0.pre8.107 or so)
 ;;; 38: (2003-01-05) changed names of internal SORT machinery
 ;;; 39: (2003-02-20) in 0.7.12.1 a slot was added to
@@ -102,6 +102,7 @@
 ;;;     incompatibly in 0.8.3.62.
 ;;; 46: (2003-11-11) Tim Daly, Jr. (and Christophe Rhodes) reported
 ;;;     .fasl incompatibility on sbcl-devel 2003-11-09.
+;;; 47: (2003-11-30) Static variables were rearranged in 0.8.6.11.
 
 ;;; the conventional file extension for our fasl files
 (declaim (type simple-string *fasl-file-type*))

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index 115a24b..166e7ac 100644 (file)
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -166,23 +166,12 @@ print_banner()
 {
     printf(
 "This is SBCL %s, an implementation of ANSI Common Lisp.\n\
+More information about SBCL is available at <http://www.sbcl.org/>.
 \n\
-SBCL is derived from the CMU CL system created at Carnegie Mellon University.\n\
-Besides software and documentation originally created at Carnegie Mellon\n\
-University, SBCL contains some software originally from the Massachusetts\n\
-Institute of Technology, Symbolics Incorporated, and Xerox Corporation, and\n\
-material contributed by volunteers since the release of CMU CL into the\n\
-public domain. See the CREDITS file in the distribution for more information.\n\
-\n\
-SBCL is a free software system, provided as is, with absolutely no warranty.\n\
-It is mostly in the public domain, but also includes some software copyrighted\n\
-  Massachusetts Institute of Technology, 1986;\n\
-  Symbolics, Inc., 1989, 1990, 1991, 1992; and\n\
-  Xerox Corporation, 1985, 1986, 1987, 1988, 1989, 1990\n\
-used under BSD-style licenses allowing copying only under certain conditions.\n\
-See the COPYING file in the distribution for more information.\n\
-\n\
-More information about SBCL is available at <http://sbcl.sourceforge.net/>.\n\
+SBCL is free software, provided as is, with absolutely no warranty.\n\
+It is mostly in the public domain; some portions are provided under\n\
+BSD-style licenses.  See the CREDITS and COPYING files in the\n\
+distribution for more information.\n\
 ", SBCL_VERSION_STRING);
 }
 \f