Merge remote-tracking branch 'origin/no-gnus'
authorLars Ingebrigtsen <larsi@gnus.org>
Mon, 20 Feb 2012 11:44:30 +0000 (12:44 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Mon, 20 Feb 2012 11:44:30 +0000 (12:44 +0100)
1  2 
lisp/ChangeLog
lisp/mm-decode.el

diff --cc lisp/ChangeLog
@@@ -1,9 -1,7 +1,11 @@@
 +2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-start.el (gnus-clean-old-newsrc): Allow a FORCE parameter.
 +
  2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
  
+       * mm-decode.el (mm-shr): Remove "soft hyphens".
        * nnimap.el (nnimap-request-list): Return the group names encoded as
        utf8.  Otherwise non-European group names don't work.
        (nnimap-request-newgroups): Ditto.
  
        * gnus-start.el (gnus-1): Avoid duplicate entries.
  
++2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
++
++      * mm-decode.el (mm-dissect-singlepart): Guess what the type of
++      application/octet-stream parts really is.
++
++      * gnus-sum.el (gnus-propagate-marks): Remove.
++
  2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
  
 -      * shr.el (shr-remove-trailing-whitespace): Really delete the padding on
 -      too-wide lines.
 +      * imap.el: Remove.
 +
 +      * nntp.el (nntp-coding-system-for-read): Remove.
 +      (nntp-coding-system-for-write): Ditto.
 +      (nntp-open-connection): Just use `binary' directly.
 +
 +      * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
 +      Gnus 0.3.
  
- 2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
-       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
-       application/octet-stream parts really is.
-       * gnus-sum.el (gnus-propagate-marks): Remove.
  2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
  
        * shr.el (shr-rescale-image): Undo previous change; see
@@@ -1772,9 -1757,11 +1772,13 @@@ If RECURSIVE, search recursively.
                                    (string-to-number (match-string 2)))
                                  mm-extra-numeric-entities)))
             (replace-match (char-to-string char))))
+        ;; Remove "soft hyphens".
+        (goto-char (point-min))
+        (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 ()