diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f282e122540..19b2a7dc76c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-06-13 Pedro Alves + + * completer.c (advance_to_completion_word): Handle delimiters. + 2019-06-11 Bernhard Heckel * dwarf2read.c (add_partial_symbol): Skip nameless modules. diff --git a/gdb/completer.c b/gdb/completer.c index d4773f2a77b..03d0d0e5dbd 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -365,11 +365,18 @@ advance_to_expression_complete_word_point (completion_tracker &tracker, info.quote_characters = gdb_completer_quote_characters; info.basic_quote_characters = rl_basic_quote_characters; + int delimiter; const char *start - = gdb_rl_find_completion_word (&info, NULL, NULL, text); + = gdb_rl_find_completion_word (&info, NULL, &delimiter, text); tracker.advance_custom_word_point_by (start - text); + if (delimiter) + { + tracker.set_quote_char (delimiter); + tracker.set_suppress_append_ws (true); + } + return start; }