From 6c096191ba0b13c3396c4b130daf64f5a9f75267 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 15 Mar 2014 13:46:15 -0700
Subject: [PATCH] Remove support for invoking old pager

---
 parser.cpp | 13 -------------
 parser.h   |  1 -
 reader.cpp | 34 +++++++++-------------------------
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/parser.cpp b/parser.cpp
index 69bbaa3ca..d512f77ef 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -3152,16 +3152,3 @@ bool parser_use_ast(void)
         return from_string<bool>(var);
     }
 }
-
-bool pager_use_inline(void)
-{
-    env_var_t var = env_get_string(L"fish_new_pager");
-    if (var.missing_or_empty())
-    {
-        return 1;
-    }
-    else
-    {
-        return from_string<bool>(var);
-    }
-}
diff --git a/parser.h b/parser.h
index f4dfcac25..2ec6ed05b 100644
--- a/parser.h
+++ b/parser.h
@@ -550,7 +550,6 @@ class parser_t
 
 /* Temporary */
 bool parser_use_ast(void);
-bool pager_use_inline(void);
 
 
 #endif
diff --git a/reader.cpp b/reader.cpp
index 250884ffb..3899e4d47 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -1988,32 +1988,16 @@ static bool handle_completions(const std::vector<completion_t> &comp, bool conti
 
             wchar_t quote;
             parse_util_get_parameter_info(el->text, el->position, &quote, NULL, NULL);
-            bool is_quoted = (quote != L'\0');
             
-            if (pager_use_inline())
-            {
-                /* Inline pager */
-                data->pager.set_prefix(prefix);
-                data->pager.set_completions(surviving_completions);
-                
-                /* Invalidate our rendering */
-                data->current_page_rendering = page_rendering_t();
-                
-                /* Modify the command line to reflect the new pager */
-                data->pager_selection_changed();
-            }
-            else
-            {
-                /* Classic pager. Clear the autosuggestion from the old commandline before abandoning it (see #561) */
-                if (! data->autosuggestion.empty())
-                    reader_repaint_without_autosuggestion();
-
-                write_loop(1, "\n", 1);
-
-                run_pager(prefix, is_quoted, surviving_completions);
-                
-                s_reset(&data->screen, screen_reset_abandon_line);
-            }
+            /* Update the pager data */
+            data->pager.set_prefix(prefix);
+            data->pager.set_completions(surviving_completions);
+            
+            /* Invalidate our rendering */
+            data->current_page_rendering = page_rendering_t();
+            
+            /* Modify the command line to reflect the new pager */
+            data->pager_selection_changed();
             
             reader_repaint_needed();