[Emacs-diffs] master updated (712607b -> 9f8c433)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  712607b   Fix bug in shr-urlify introduced in previous patch
       new  7e47d44   Prefer settings from ~/.mailcap over system and Emacs 
settings
       new  9f8c433   Fix syntax error in emacs-mime.texi in last check-in


Summary of changes:
 doc/misc/emacs-mime.texi | 12 ++++++++++++
 etc/NEWS                 | 14 +++++++++++++-
 lisp/net/mailcap.el      | 19 ++++++++++++++++---
 3 files changed, 41 insertions(+), 4 deletions(-)