From d6e1c6e6c5961b8e7dee7ff1fc7d1792ab0fb4f8 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 29 Jan 2012 16:30:12 +0000 Subject: [PATCH] Guile portability Don't support Guile 1.6 and use a portable test for printable strings. --- ChangeLog | 6 ++++++ gmk-default.scm | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e396444..3c52a4a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-29 Paul Smith + + * gmk-default.scm (to-string-maybe): Use a more portable way to + test for unprintable characters. + * configure.in [GUILE]: Guile 1.6 doesn't have pkg-config + 2012-01-28 Eli Zaretskii * config.h.W32.template: Update from config.h.in. diff --git a/gmk-default.scm b/gmk-default.scm index b9161c4e..9aca54a5 100644 --- a/gmk-default.scm +++ b/gmk-default.scm @@ -31,8 +31,7 @@ ((char? x) (string x)) ;; Printable string (no special characters) - ((and (string? x) - (eq? (string-length (string-delete x char-set:printing)) 0)) + ((and (string? x) (string-every char-set:printing x)) x) ;; No idea: fail (else (error "Unknown object:" x))))