Merge remote branch 'origin/no-gnus'

diff --cc lisp/ChangeLog
index 3e50751,3f30576..170ff52
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,10 -1,8 +1,15 @@@
 +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>
+ 
+       * gnus-msg.el (gnus-bug): Don't delete the other windows.  We may be
+       using a `gnus-use-full-window' setup (bug#11013).
+ 
  2012-03-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
        * gnus-int.el (gnus-backend-trace): Flip default to nil before Emacs
@@@ -80,24 -74,11 +85,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/gnus-msg.el
Simple merge