mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 21:59:08 -05:00
style: '-f' reads input files as UTF-8 by default.
Reported by mirai on #guix. * guix/scripts/style.scm (format-whole-file): Wrap body in 'with-fluids'. Pass #:guess-encoding to 'call-with-input-file'.
This commit is contained in:
parent
238d983b4e
commit
82bde985f4
1 changed files with 9 additions and 7 deletions
|
@ -335,13 +335,15 @@ (define (package-location<? p1 p2)
|
|||
|
||||
(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))))))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
Loading…
Reference in a new issue