Merge remote-tracking branch 'origin/master' into core-updates

 Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm

1 files changed, 9 insertions, 7 deletions

diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index c0b9ea1a28..fa7175fb16 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -335,13 +335,15 @@ PACKAGE."
 
 (define* (format-whole-file file #:rest rest)
   "Reformat all of FILE."
-  (let ((lst (call-with-input-file file read-with-comments/sequence)))
-    (with-atomic-file-output file
-      (lambda (port)
-        (apply pretty-print-with-comments/splice port lst
-               #:format-comment canonicalize-comment
-               #:format-vertical-space canonicalize-vertical-space
-               rest)))))
+  (with-fluids ((%default-port-encoding "UTF-8"))
+    (let ((lst (call-with-input-file file read-with-comments/sequence
+                                     #:guess-encoding #t)))
+      (with-atomic-file-output file
+        (lambda (port)
+          (apply pretty-print-with-comments/splice port lst
+                 #:format-comment canonicalize-comment
+                 #:format-vertical-space canonicalize-vertical-space
+                 rest))))))
 
 
 ;;;