me/guix
Archived
1
0
Fork 0
Code Activity

ui: Restore line wrapping for 'package->recutils'.

Browse source 
Fixes a regression introduced when switching to Guile 3.0.0 whereby
monkey-patching 'wrap*' wouldn't have any effects due to inlining.

* guix/ui.scm (%text-width): Define in terms of the '*line-width*' fluid
when it's defined.
<top level>: Set (@@ (texinfo plain-text) wrap*) only when
'*line-width*' is undefined.
This commit is contained in:
Ludovic Courtès 2020-03-11 16:07:04 +01:00
parent 10c2ca9e4a
commit 3c1ea8dcef
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
guix/ui.scm
View file

@ -1218,8 +1218,15 @@ converted to a space; sequences of more than one line break are preserved."
;;; ;;;
(define %text-width (define %text-width
(make-parameter (terminal-columns))) ;; '*line-width*' was introduced in Guile 2.2.7/3.0.1. On older versions of
;; Guile, monkey-patch 'wrap*' below.
(if (defined? '*line-width*)
(let ((parameter (fluid->parameter *line-width*)))
(parameter (terminal-columns))
parameter)
(make-parameter (terminal-columns))))
(unless (defined? '*line-width*) ;Guile < 2.2.7
(set! (@@ (texinfo plain-text) wrap*) (set! (@@ (texinfo plain-text) wrap*)
;; XXX: Monkey patch this private procedure to let 'package->recutils' ;; XXX: Monkey patch this private procedure to let 'package->recutils'
;; parameterize the fill of description field correctly. ;; parameterize the fill of description field correctly.
@ -1227,7 +1234,7 @@ converted to a space; sequences of more than one line break are preserved."
(let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*)))) (let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*))))
(fill-string (string-concatenate strings) (fill-string (string-concatenate strings)
#:line-width (%text-width) #:initial-indent indent #:line-width (%text-width) #:initial-indent indent
#:subsequent-indent indent)))) #:subsequent-indent indent)))))
(define (texi->plain-text str) (define (texi->plain-text str)
"Return a plain-text representation of texinfo fragment STR." "Return a plain-text representation of texinfo fragment STR."