From 935542fbde17f0bc865cbcbb8d9f632bd592cc96 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Nov 2017 23:27:56 +0100 Subject: ui: Add 'display-hint'. * guix/ui.scm (known-variable-definition): New procedure. (report-load-error): Use it. --- guix/ui.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'guix/ui.scm') diff --git a/guix/ui.scm b/guix/ui.scm index a1152605e6..02f3638f3a 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -229,6 +229,13 @@ messages." (else #t)))))) +(define* (display-hint message #:optional (port (current-error-port))) + "Display MESSAGE, a l10n message possibly containing Texinfo markup, to +PORT." + (format port (G_ "hint: ~a~%") + (fill-paragraph (texi->plain-text message) + (terminal-columns) 8))) + (define* (report-load-error file args #:optional frame) "Report the failure to load FILE, a user-provided Scheme file. ARGS is the list of arguments received by the 'throw' handler." @@ -262,9 +269,7 @@ ARGS is the list of arguments received by the 'throw' handler." %gettext-domain))) (report-error (G_ "exception thrown: ~s~%") obj)) (when (fix-hint? obj) - (format (current-error-port) (G_ "hint: ~a~%") - (fill-paragraph (texi->plain-text (condition-fix-hint obj)) - (terminal-columns) 8)))) + (display-hint (condition-fix-hint obj)))) ((error args ...) (report-error (G_ "failed to load '~a':~%") file) (apply display-error frame (current-error-port) args)))) -- cgit v1.2.3