aboutsummaryrefslogtreecommitdiffhomepage
path: root/reader.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-03-15 13:46:15 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-03-15 13:46:15 -0700
commit6c096191ba0b13c3396c4b130daf64f5a9f75267 (patch)
tree765a6813666827d9be0d381abf2bb824b514b4d6 /reader.cpp
parent20f9dd9a6bd5c90f7fc2304ad232bec5faebd835 (diff)
Remove support for invoking old pager
Diffstat (limited to 'reader.cpp')
-rw-r--r--reader.cpp34
1 files changed, 9 insertions, 25 deletions
diff --git a/reader.cpp b/reader.cpp
index 250884ff..3899e4d4 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();