Now that linking works, change WRITE-NOTIFICATION-LINE to be an alias

for WITH-NOTIFICATION, as originally planned.

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 65677b2929df6210fe606214f54693ff85ab2fd8..6ad89b360445b65810c26b44a4b652ab43499c20 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.641 2008/02/02 06:53:36 cph Exp $
+$Id: runtime.pkg,v 14.642 2008/02/02 17:59:58 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -4290,13 +4290,13 @@ USA.
   (files "usrint")
   (parent (runtime))
   (export ()
+         (write-notification-line with-notification)
          prompt-for-command-char
          prompt-for-command-expression
          prompt-for-confirmation
          prompt-for-evaluated-expression
          prompt-for-expression
-         with-notification
-         write-notification-line)
+         with-notification)
   (export (runtime rep)
          port/set-default-environment
          port/write-result)

diff --git a/v7/src/runtime/usrint.scm b/v7/src/runtime/usrint.scm
index c8fea1ab8a6e25f56ae7dd3586d8082e2073b59d..18cf9c67f17ee29adb35aac99677145b801f35af 100644 (file)
--- a/v7/src/runtime/usrint.scm
+++ b/v7/src/runtime/usrint.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: usrint.scm,v 1.31 2008/02/02 06:53:37 cph Exp $
+$Id: usrint.scm,v 1.32 2008/02/02 17:59:59 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -294,7 +294,10 @@ USA.
 
 (define (with-notification message #!optional thunk)
   (if (or (default-object? thunk) (not thunk))
-      (write-notification-line message)
+      (let ((port (notification-output-port)))
+       (fresh-line port)
+       (write-notification-prefix port)
+       (message (wrap-notification-port port)))
       (let ((done? #f)
            (n))
        (dynamic-wind
@@ -326,12 +329,6 @@ USA.
                 (set! n)
                 (write-string "done" port)
                 (newline port))))))))
-
-(define (write-notification-line message)
-  (let ((port (notification-output-port)))
-    (fresh-line port)
-    (write-notification-prefix port)
-    (message (wrap-notification-port port))))
 \f
 (define (wrap-notification-port port)
   (make-port wrapped-notification-port-type port))