master updated (896384b -> c3d029c)

[Mattias Engdegård]

mattiase pushed a change to branch master.

      from  896384b   Make (setf (map-elt ...)) return the value in the 
alist/plist cases
       new  12bab20   Tidy file-matching regexps and remove some ineffective 
backslashes
       new  c3d029c   Don't fail image-tests if JPEG format isn't compiled in


Summary of changes:
 lisp/emacs-lisp/package.el | 2 +-
 lisp/help.el               | 2 +-
 lisp/net/tramp-cmds.el     | 2 +-
 lisp/transient.el          | 2 +-
 test/lisp/image-tests.el   | 4 +++-
 5 files changed, 7 insertions(+), 5 deletions(-)