summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-11-15 19:47:26 +0100
committerGuix Patches Tester <>2020-11-15 18:49:08 +0000
commit0a4b3c4f7cb3747524d3e445e8682f9bb64f9fca (patch)
tree10abddb0cb07b8ad98b10485a20e0544dae3c8a1
parent06269abece3f14cc0829b81e3eca3f627a223b2d (diff)
downloadguix-patches-0a4b3c4f7cb3747524d3e445e8682f9bb64f9fca.tar
guix-patches-0a4b3c4f7cb3747524d3e445e8682f9bb64f9fca.tar.gz
ui: Launch $PAGER through the shell.series-5773
This is the convention elsewhere and sounds like the right thing to do. * guix/ui.scm (call-with-paginated-output-port): Substitute OPEN-PIPE for OPEN-PIPE*. Reported by Daniel Brooks <db48x@db48x.net>.
-rw-r--r--guix/ui.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/ui.scm b/guix/ui.scm
index 4e686297e8..2b7d9dd64b 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -72,7 +72,7 @@
#:use-module (ice-9 match)
#:use-module (ice-9 format)
#:use-module (ice-9 regex)
- #:autoload (ice-9 popen) (open-pipe* close-pipe)
+ #:autoload (ice-9 popen) (open-pipe close-pipe)
#:autoload (system base compile) (compile-file)
#:autoload (system repl repl) (start-repl)
#:autoload (system repl debug) (make-debug stack->vector)
@@ -1673,9 +1673,9 @@ zero means that PACKAGE does not match any of REGEXPS."
;; instead of 'r': this strips hyperlinks but allows 'less' to make a
;; good estimate of the line length.
(let ((pager (with-environment-variables `(("LESS" ,less-options))
- (open-pipe* OPEN_WRITE
- (or (getenv "GUIX_PAGER") (getenv "PAGER")
- "less")))))
+ (open-pipe (or (getenv "GUIX_PAGER") (getenv "PAGER")
+ "less")
+ OPEN_WRITE))))
(dynamic-wind
(const #t)
(lambda () (proc pager))