From 15491f632c520ad808837358cbcb2a45330ce2f6 Mon Sep 17 00:00:00 2001 From: Peter Bex Date: Thu, 19 Nov 2015 16:51:25 +0100 Subject: [PATCH] Make ##sys#with-print-limit a bit more consistent. This fixes #951, for the most part. --- library.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/library.scm b/library.scm index 377c882..1c83f84 100644 --- a/library.scm +++ b/library.scm @@ -3160,8 +3160,7 @@ EOF (define ##sys#print-exit (make-parameter #f)) (define ##sys#print - (let ((string-append string-append) - (case-sensitive case-sensitive) + (let ((case-sensitive case-sensitive) (keyword-style keyword-style)) (lambda (x readable port) (##sys#check-output-port port #t #f) @@ -3175,12 +3174,11 @@ EOF (let* ((len (##sys#size str)) (cpp0 (current-print-length)) (cpl (fx+ cpp0 len)) ) - (if (fx>= cpl length-limit) - (cond ((fx> len 3) - (let ((n (fx- length-limit cpp0))) - (when (fx> n 0) (outstr0 port (##sys#substring str 0 n))) - (outstr0 port "...") ) ) - (else (outstr0 port str)) ) + (if (fx> cpl length-limit) + (let ((n (fx- length-limit cpp0))) + (when (fx> n 0) (outstr0 port (##sys#substring str 0 n))) + (outstr0 port "...") + ((##sys#print-exit) (##sys#void)) ) (outstr0 port str) ) (current-print-length cpl) ) (outstr0 port str) ) ) @@ -3194,7 +3192,7 @@ EOF (current-print-length (fx+ cpp0 1)) (when (fx>= cpp0 length-limit) (outstr0 port "...") - ((##sys#print-exit) #t) ))) + ((##sys#print-exit) (##sys#void)) ))) ((##sys#slot (##sys#slot port 2) 2) port chr)) (define (specialchar? chr) -- 2.1.4