master updated (36941e9e6a5 -> 2407f810136)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  36941e9e6a5 Font-lock shorthands with arbitrary punctuation 
(bug#67390)
       new  01e71789177 ; Fix erc--channel-modes test on graphical displays
       new  2407f810136 Restore prompt correctly when reconnecting in ERC


Summary of changes:
 lisp/erc/erc-fill.el                            |  2 +-
 lisp/erc/erc.el                                 |  4 +-
 test/lisp/erc/erc-scenarios-display-message.el  |  3 +-
 test/lisp/erc/erc-tests.el                      | 51 ++++++++++++++++++++++++-
 test/lisp/erc/resources/erc-scenarios-common.el | 23 +++++++++--
 5 files changed, 75 insertions(+), 8 deletions(-)