Merge remote branch 'origin/no-gnus'

diff --cc lisp/ChangeLog
index d6b2626,d2a2590..9aa2949
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,29 -1,13 +1,36 @@@
 +2012-03-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * shr.el (shr-insert): Treat non-breaking space just like normal
 +      space.  This seems to produce more pleasing results.
 +      (shr-tag-br): Make <br> only ensure a line break instead of always
 +      creating a blank line.  This looks more readable in my test corpus.
 +      (shr-insert): Only insert a blank line if we're starting from an image.
 +
 +2012-03-15  Elias Pipping  <pipping@lavabit.com>
 +
 +      * Makefile.in: Respect DESTDIR.
 +
 +2012-03-14  Christopher Schmidt  <christopher@ch.ristopher.com>
 +
 +        * gnus-msg.el (gnus-inews-do-gcc): Add gnus-gcc-pre-body-encode-hook
 +        and gnus-gcc-post-body-encode-hook.
 +
 +2012-03-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-group.el (gnus-group-expire-articles-1): Don't try to expire
 +      messages that don't exist.
 +
 +      * gnus-sum.el (gnus-summary-expire-articles): Ditto.
 +
++2012-03-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
++
+ 2012-03-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * shr.el (shr-insert): Update the text state properly to avoid
+       inserting spurious paragraph starts.
+ 
  2012-03-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 -      * gnus-sum.el (gnus-update-marks): Don't propagate marks unless
 -      requested (bug#10961).
 -
        * shr.el (shr-table-widths): Divide the extra width more fairly over
        the TDs (bug#10973).
        (shr-render-td): Don't delete too much padding.
@@@ -113,24 -93,11 +120,24 @@@
  
        * 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

diff --cc lisp/shr.el
Simple merge