Merge remote-tracking branch 'origin/no-gnus'

diff --cc lisp/mm-decode.el
index 9a852fa,0961738..1278d11
--- 1/lisp/mm-decode.el
--- 2/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@@ -1774,11 -1759,9 +1774,11 @@@ If RECURSIVE, search recursively.
             (replace-match (char-to-string char))))
         ;; Remove "soft hyphens".
         (goto-char (point-min))
-        (while (search-forward "-" nil t)
+        (while (search-forward "­" nil t)
           (replace-match "" t t))
         (libxml-parse-html-region (point-min) (point-max))))
 +      (unless (bobp)
 +      (insert "\n"))
        (mm-handle-set-undisplayer
         handle
         `(lambda ()