diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
tree | 21778401485e3b8683bbc6a31769233c059683b1 /guix | |
parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
download | gnu-guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar gnu-guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
Diffstat (limited to 'guix')
-rw-r--r-- | guix/profiles.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index 9dc9ab43b9..aa88b849e1 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -321,10 +321,10 @@ replacement if PORT is not Unicode-capable." (let ((arrow "→")) (catch 'encoding-error (lambda () - (with-fluids ((%default-port-conversion-strategy 'error)) - (with-output-to-string - (lambda () - (display arrow))))) + (call-with-output-string + (lambda (port) + (set-port-conversion-strategy! port 'error) + (display arrow port)))) (lambda (key . args) "->"))))) |