>From 429ff285609120c4135eb64f1d6911924a24f5e6 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Fri, 25 Sep 2015 00:37:36 +0200 Subject: [PATCH] lint: Improve 'check-texinfo-markup'. * guix/scripts/lint.scm (check-description-style): Set 'field' parameter when emitting a warning in 'check-texinfo-markup'. Catch any error that may occur in during the 'texi->plain-text' conversion. This is a followup to commit 2748ee3. --- guix/scripts/lint.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index b0427f7..0adb3bf 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -146,11 +146,11 @@ monad." (define (check-texinfo-markup description) "Check that DESCRIPTION can be parsed as a Texinfo fragment. If the markup is valid return a plain-text version of DESCRIPTION, otherwise #f." - (catch 'parser-error - (lambda () (texi->plain-text description)) - (lambda (keys . args) - (emit-warning package (_ "Texinfo markup in description is invalid")) - #f))) + (unless (false-if-exception (texi->plain-text description)) + (emit-warning package + (_ "Texinfo markup in description is invalid") + 'description) + #f)) (define (check-proper-start description) (unless (or (properly-starts-sentence? description) -- 2.5.3