From ebef02dd8f35f8b6ee58060b71b7f321a5027760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 30 Nov 2020 10:19:52 +0100 Subject: [PATCH] pager: stop disabling urlification under a pager Less 568 properly shows urlified strings. Putative NEWS entry: * Urlification is now enabled by default even when a pager is used. Previously it was disabled, because less would not show such markup properly. This has been fixed in less 568. Please either upgrade less, or use SYSTEMD_URLIFY=0 to disable the feature. --- src/shared/pretty-print.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c index ca5b25a7ab..0f02f32760 100644 --- a/src/shared/pretty-print.c +++ b/src/shared/pretty-print.c @@ -21,10 +21,6 @@ bool urlify_enabled(void) { static int cached_urlify_enabled = -1; - /* Unfortunately 'less' doesn't support links like this yet 😭, hence let's disable this as long as there's a - * pager in effect. Let's drop this check as soon as less got fixed a and enough time passed so that it's safe - * to assume that a link-enabled 'less' version has hit most installations. */ - if (cached_urlify_enabled < 0) { int val; @@ -32,7 +28,7 @@ bool urlify_enabled(void) { if (val >= 0) cached_urlify_enabled = val; else - cached_urlify_enabled = colors_enabled() && !pager_have(); + cached_urlify_enabled = colors_enabled(); } return cached_urlify_enabled;