From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 30 Nov 2020 09:19:52 +0000 (+0100)
Subject: pager: stop disabling urlification under a pager
X-Git-Tag: v248-rc1~612
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebef02dd8f35f8b6ee58060b71b7f321a5027760;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index ca5b25a7abf..0f02f327601 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;