diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-07-02 11:07:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-07-02 23:54:02 +0200 |
| commit | 31522dfa1951c655898afb37eda58c048d1c2338 (patch) | |
| tree | 48e8b377bb40e2442dc73ffa23bfd74676190aac | |
| parent | 415beccb1d43cc36e03041fe59642929dc3da1e4 (diff) | |
| download | guix-31522dfa1951c655898afb37eda58c048d1c2338.tar guix-31522dfa1951c655898afb37eda58c048d1c2338.tar.gz | |
Revert "ui: Use package-description-string."
This reverts commit bd03e99f66be1a038e3a8aeb502f5153fd05cc67.
Reported by Ekaitz Zarraga <ekaitz@elenq.tech> at
<https://lists.gnu.org/archive/html/guix-devel/2020-06/msg00338.html>.
That commit broke would prevent "description: " from being taken into
account by the 'texi->plain-text' paragraph filling code.
| -rw-r--r-- | guix/ui.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index d64bb68f05..88a046a177 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1471,8 +1471,12 @@ HYPERLINKS? is true, emit hyperlink escape sequences when appropriate." (string->recutils (string-trim-right (parameterize ((%text-width width*)) - (string-append "description: " - (or (package-description-string p) ""))) + ;; Call 'texi->plain-text' on the concatenated string to account + ;; for the width of "description:" in paragraph filling. + (texi->plain-text + (string-append "description: " + (or (and=> (package-description p) P_) + "")))) #\newline))) (for-each (match-lambda ((field . value) |