From 12696546179499ce28d940a609b89f48dc749213 Mon Sep 17 00:00:00 2001 From: Timothy Stack Date: Tue, 25 Aug 2020 16:27:22 -0700 Subject: [PATCH] fix SQL prompt help lookup Fixes #748 --- src/readline_callbacks.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/readline_callbacks.cc b/src/readline_callbacks.cc index 5b5c76f8..826192b4 100644 --- a/src/readline_callbacks.cc +++ b/src/readline_callbacks.cc @@ -404,12 +404,16 @@ static void rl_search_internal(void *dummy, readline_curses *rc, bool complete = dtc.get_dimensions(doc_height, doc_width); etc.get_dimensions(ex_height, ex_width); if (help_count > 1 && name != func_pair.first->second->ht_name) { - while (find(kw.begin(), kw.end(), - func_pair.first->second->ht_name) == kw.end()) { - ++func_pair.first; + while (func_pair.first != func_pair.second) { + if (find(kw.begin(), kw.end(), + func_pair.first->second->ht_name) == kw.end()) { + ++func_pair.first; + } else { + func_pair.second = next(func_pair.first); + break; + } } - func_pair.second = next(func_pair.first); - help_count = 1; + help_count = distance(func_pair.first, func_pair.second); } for (auto func_iter = func_pair.first; func_iter != func_pair.second;