master updated (ad2bb3e9f36 -> 3979f83cd60)

[F. Jason Park]

jpneverwas pushed a change to branch master.

      from  ad2bb3e9f36 Properly translate touch screen events into mouse drag 
ones
       new  019baf28599 Remove newline from erc-fill regexp
       new  ffd5d2f38d3 Fix wrong "User" column count in erc-ibuffer
       new  6135fec6926 ; Increase ERC test server queue size
       new  06fb8b76208 Exempt text-scale-mode from erc-scrolltobottom-all
       new  8db56235cbc Prefer ticks/hz pairs for some ERC timestamps on 29+
       new  a3c6ed0e364 Improve erc-warn-about-blank-lines behavior
       new  3979f83cd60 Inhibit slash commands in erc--input-review-functions


Summary of changes:
 etc/ERC-NEWS                                    |   8 +-
 lisp/erc/erc-common.el                          |   1 +
 lisp/erc/erc-compat.el                          |  15 ++
 lisp/erc/erc-fill.el                            |   5 +-
 lisp/erc/erc-goodies.el                         |  14 +-
 lisp/erc/erc-ibuffer.el                         |  16 +-
 lisp/erc/erc-stamp.el                           |   2 +-
 lisp/erc/erc.el                                 | 166 +++++++++++++++------
 test/lisp/erc/erc-scenarios-scrolltobottom.el   |   4 +-
 test/lisp/erc/erc-tests.el                      | 189 ++++++++++++++++++------
 test/lisp/erc/resources/erc-d/erc-d.el          |  50 +++----
 test/lisp/erc/resources/erc-scenarios-common.el |   3 +-
 12 files changed, 331 insertions(+), 142 deletions(-)