[Bps-public-commit] Prophet - A disconnected, replicated p2p database branch, master, updated. b9254c5e6b99ed79e465c935937fb28be6cfde7d

[jesse]

The branch, master has been updated
       via  b9254c5e6b99ed79e465c935937fb28be6cfde7d (commit)
      from  2ebe077abfd4c34e84179d7444e9218aad410df8 (commit)

Summary of changes:
 lib/Prophet/CLI.pm               |    4 ++--
 lib/Prophet/CLI/Command/Shell.pm |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit b9254c5e6b99ed79e465c935937fb28be6cfde7d
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Feb 11 10:23:47 2009 -0500

    Pager shouldn't exit instantly at the end of the output; Pager should
    clear after a command runs no matter what in the shell

diff --git a/lib/Prophet/CLI.pm b/lib/Prophet/CLI.pm
index 98efc78..55cb6be 100644
--- a/lib/Prophet/CLI.pm
+++ b/lib/Prophet/CLI.pm
@@ -172,8 +172,8 @@ sub start_pager {
     my $self = shift;
     my $content = shift;
     if (is_interactive() && !$ORIGINAL_STDOUT) {
-        local  $ENV{'LESS'} = '-FXE';
-        local  $ENV{'MORE'} = '-FXE';
+        local  $ENV{'LESS'} = '-FXe';
+        local  $ENV{'MORE'} = '-FXe';
 
         my $pager = $self->get_pager();
         return unless $pager;
diff --git a/lib/Prophet/CLI/Command/Shell.pm b/lib/Prophet/CLI/Command/Shell.pm
index a203ef6..852fca3 100644
--- a/lib/Prophet/CLI/Command/Shell.pm
+++ b/lib/Prophet/CLI/Command/Shell.pm
@@ -42,6 +42,7 @@ sub preamble {
 
 sub read {
     my $self = shift;
+    Prophet::CLI->end_pager; # in case a previous command died
     $self->readline($self->prompt);
 }
 

-----------------------------------------------------------------------