Merge commit 'origin/master'

Conflicts:
	Changes

Changes

@@ -1,4 +1,5 @@
 0.11
+    - Use PAGER environment variable if set
     - Fix bug which was causing it to only accept 's02' but not 's02-bits'
 
 0.10 Thu Jul  2 16:49:16 GMT 2009

MANIFEST

@@ -63,6 +63,7 @@ share/Spec/S32-setting-library/Rules.pod
 share/Spec/S32-setting-library/Str.pod
 share/Spec/S32-setting-library/Temporal.pod
 inc/Module/Install.pm
+inc/Module/Install/AuthorRequires.pm
 inc/Module/Install/AuthorTests.pm
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm

Makefile.PL

@@ -25,6 +25,10 @@ requires       ('Pod::Xhtml'               => '0');
 requires       ('Win32::Console::ANSI'     => '0') if $^O eq 'MSWin32';
 test_requires  ('Test::More'               => '0');
 test_requires  ('Test::Script'             => '0');
+author_requires('Perl::Critic'             => '1.098');
+author_requires('Test::Perl::Critic'       => '0');
+author_requires('Test::Pod'                => '0');
+author_requires('Test::Pod::Coverage'      => '0');
 tests_recursive();
 recursive_author_tests('xt');
 WriteAll();

lib/App/Grok.pm

@@ -255,7 +255,7 @@ sub _print {
         print $output;
     }
     else {
-        my $pager = $Config{pager};
+        my $pager = defined $ENV{PAGER} ? $ENV{PAGER} : $Config{pager};
         my ($temp_fh, $temp) = tempfile(UNLINK => 1);
         print $temp_fh $output;
         close $temp_fh;