master updated (1ba8d1c4370 -> b5d36efa577)

[Juri Linkov]

jurta pushed a change to branch master.

      from  1ba8d1c4370 Add more erc-message-type choices
       new  28c9c7cf464 Fix next-line-completion for multi-line completions
       new  b5d36efa577 Update minibuffer-show-help based on 
minibuffer-visible-completions


Summary of changes:
 lisp/simple.el                | 48 ++++++++++++++++++++++++++++++++++---------
 test/lisp/minibuffer-tests.el | 14 +++++++++++++
 2 files changed, 52 insertions(+), 10 deletions(-)