]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
pager: stop disabling urlification under a pager
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 30 Nov 2020 09:19:52 +0000 (10:19 +0100)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 2 Dec 2020 07:50:44 +0000 (16:50 +0900)
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

index ca5b25a7abf0bbb600eb90c87b1061f3623b4e0a..0f02f327601171d77aa690ca01063984aff4a668 100644 (file)
 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;