summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pager.c12
-rw-r--r--lib/terminal-colors.d.54
2 files changed, 5 insertions, 11 deletions
diff --git a/lib/pager.c b/lib/pager.c
index 98814b5..db7a989 100644
--- a/lib/pager.c
+++ b/lib/pager.c
@@ -85,9 +85,7 @@ static int start_command(struct child_process *cmd)
close(cmd->in);
}
- if (cmd->preexec_cb)
- cmd->preexec_cb();
-
+ cmd->preexec_cb();
execvp(cmd->argv[0], (char *const*) cmd->argv);
errexec(cmd->argv[0]);
}
@@ -142,7 +140,7 @@ static int finish_command(struct child_process *cmd)
return wait_or_whine(cmd->pid);
}
-static void pager_preexec_less(void)
+static void pager_preexec(void)
{
/*
* Work around bug in "less" by not starting it until we
@@ -242,11 +240,7 @@ static void __setup_pager(void)
pager_argv[2] = pager;
pager_process.argv = pager_argv;
pager_process.in = -1;
-
- if (!strncmp(pager, "less", 4))
- pager_process.preexec_cb = pager_preexec_less;
- else
- pager_process.preexec_cb = NULL;
+ pager_process.preexec_cb = pager_preexec;
if (start_command(&pager_process))
return;
diff --git a/lib/terminal-colors.d.5 b/lib/terminal-colors.d.5
index 1de42f4..5712adb 100644
--- a/lib/terminal-colors.d.5
+++ b/lib/terminal-colors.d.5
@@ -4,10 +4,10 @@
.\" Generator: Asciidoctor 2.0.20
.\" Date: 2024-01-31
.\" Manual: File formats
-.\" Source: util-linux 2.40
+.\" Source: util-linux 2.40.1
.\" Language: English
.\"
-.TH "TERMINAL\-COLORS.D" "5" "2024-01-31" "util\-linux 2.40" "File formats"
+.TH "TERMINAL\-COLORS.D" "5" "2024-01-31" "util\-linux 2.40.1" "File formats"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0