Merge branch 'no-gnus' of https://git.gnus.org/gnus into no-gnus

diff --cc lisp/ChangeLog
index cc5ac49,9e92a53..2306e82
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,16 -1,8 +1,21 @@@
 +2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * shr.el (shr-insert-document): Add doc string.
 +      (shr-visit-file): Ditto.
 +      (shr-remove-trailing-whitespace): New function.
 +      (shr-insert-document): Use it to clean up trailing whitespace as the
 +      final step (bug#10714).
 +
 +2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
 +      buffer if `gnus-kill-summary-on-exit' is nil.
 +
+ 2012-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 
+       * gnus-sum.el (gnus-summary-show-thread):
+       next-single-char-property-change may return nil in XEmacs.
+ 
  2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
  
        * gnus-sum.el (gnus-handle-ephemeral-exit): Allow exiting from Gnus

diff --cc lisp/gnus-sum.el
Simple merge