Import Debian changes 3a5-1debian/3a5-1

slib (3a5-1) unstable; urgency=low

  * New upstream release.
  
  * slib.texi (Library Catalogs): Repeat change from 3a3-3.
    
  * Makefile: Repeat $(htmldir)slib_toc.html changes from 3a2-1.
   
  * guile.init: (library-vicinity): Repeat change from 3a4-2.
  
  * debian/rules (binary-indep): Don't hide .init files in a separate
    subdirectory, thus conforming better to the usual slib practice.  Put a 
    symlink in place to ease transitions.  (Closes: #407370).

1 files changed, 20 insertions, 20 deletions

diff --git a/trnscrpt.scm b/trnscrpt.scm
index aaec7cb..d801621 100644
--- a/trnscrpt.scm
+++ b/trnscrpt.scm
@@ -1,5 +1,5 @@
 ; "trnscrpt.scm", transcript functions for Scheme.
-; Copyright (c) 1992, 1993, 1995 Aubrey Jaffer
+; Copyright (c) 1992, 1993, 1995, 2007 Aubrey Jaffer
 ;
 ;Permission to copy this software, to modify it, to redistribute it,
 ;to distribute modified versions, and to use it for any purpose is
@@ -28,49 +28,49 @@
   (set! transcript:port #f))
 ;@
 (define read-char
-  (let ((read-char read-char) (write-char write-char))
+  (let ((rd-chr read-char) (wrt-chr write-char))
     (lambda opt
-      (let ((ans (apply read-char opt)))
+      (let ((ans (apply rd-chr opt)))
 	(cond ((eof-object? ans))
 	      ((output-port? transcript:port)
-	       (write-char ans transcript:port)))
+	       (wrt-chr ans transcript:port)))
 	ans))))
 ;@
 (define read
-  (let ((read read) (write write) (newline newline))
+  (let ((rd read) (wrt write) (nwln newline))
     (lambda opt
-      (let ((ans (apply read opt)))
+      (let ((ans (apply rd opt)))
 	(cond ((eof-object? ans))
 	      ((output-port? transcript:port)
-	       (write ans transcript:port)
+	       (wrt ans transcript:port)
 	       (if (eqv? #\newline (apply peek-char opt))
-		   (newline transcript:port))))
+		   (nwln transcript:port))))
 	ans))))
 ;@
 (define write-char
-  (let ((write-char write-char))
+  (let ((wrt-chr write-char))
     (lambda (obj . opt)
-      (apply write-char obj opt)
+      (apply wrt-chr obj opt)
       (if (output-port? transcript:port)
-	  (write-char obj transcript:port)))))
+	  (wrt-chr obj transcript:port)))))
 ;@
 (define write
-  (let ((write write))
+  (let ((wrt write))
     (lambda (obj . opt)
-      (apply write obj opt)
+      (apply wrt obj opt)
       (if (output-port? transcript:port)
-	  (write obj transcript:port)))))
+	  (wrt obj transcript:port)))))
 ;@
 (define display
-  (let ((display display))
+  (let ((dspl display))
     (lambda (obj . opt)
-      (apply display obj opt)
+      (apply dspl obj opt)
       (if (output-port? transcript:port)
-	  (display obj transcript:port)))))
+	  (dspl obj transcript:port)))))
 ;@
 (define newline
-  (let ((newline newline))
+  (let ((nwln newline))
     (lambda opt
-      (apply newline opt)
+      (apply nwln opt)
       (if (output-port? transcript:port)
-	  (newline transcript:port)))))
+	  (nwln transcript:port)))))