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

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d6153b..13a5048 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -17,6 +17,16 @@
        next-single-char-property-change may return nil in XEmacs.
        (gnus-summary-article-map): Fix typo.
 
+2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-remove-trailing-whitespace): Don't strip whitespace from
+       lines that are narrower than the window width.  Otherwise background
+       "blocks" will look less readable.
+
+2012-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-sum.el (gnus-summary-show-thread): Revert last two changes.
+
 2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-transform-headers): Remove unused variable.