unbreak test: s/log_write/logwrite/

[exim.git] / src / src / exigrep.src

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index 118cd91b91d41c00fd21c76e99fb53b6458415b3..5db01fe082e8303356dd9789c125ac4498a7981d 100644 (file)
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
@@ -233,7 +233,7 @@ GetOptions(
       'version'        => sub {
             print basename($0) . ": $0\n",
                 "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
-                "perl(runtime): $^V\n";
+                "perl(runtime): $]\n";
             exit 0;
       },
 ) and @ARGV or pod2usage;
@@ -244,7 +244,8 @@ $pattern = quotemeta $pattern if $literal;
 # Start a pager if output goes to a terminal
 if (-t 1 and $use_pager)
   {
-  foreach ($ENV{PAGER}//(), 'less', 'more')
+  # for perl >= v5.10.x: foreach ($ENV{PAGER}//(), 'less', 'more')
+  foreach (defined $ENV{PAGER} ? $ENV{PAGER} : (), 'less', 'more')
     {
     local $ENV{LESS} .= ' --no-init --quit-if-one-screen';
     open(my $pager, '|-', $_) or next;