master updated (21097cd -> 5c86a53)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  21097cd   Revert recent server.el frame-focus changes
       new  22c1f00   Allow string-slice to take zero-length matches
       new  5c86a53   Improve the string-limit doc string


Summary of changes:
 lisp/emacs-lisp/shortdoc.el          |  3 +++
 lisp/emacs-lisp/subr-x.el            | 29 +++++++++++++++--------------
 test/lisp/emacs-lisp/subr-x-tests.el |  4 +++-
 3 files changed, 21 insertions(+), 15 deletions(-)