Merge changes made in No Gnus

gnus.texi (Mail Source Specifiers): Add a pop3 via an SSH tunnel example (modified from an example by Michael Albinus).
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.

4 files changed, 34 insertions, 10 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6bb1e065d37..3458a8865fb 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Mail Source Specifiers): Add a pop3 via an SSH tunnel
+        example (modified from an example by Michael Albinus).
+
 2012-01-30  Philipp Haselwarter  <philipp.haselwarter@gmx.de>  (tiny change)
 
         * gnus.texi (Agent Basics): Fix outdated description of
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 1883975b7f6..865888a28e4 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14751,6 +14751,18 @@ corresponding keywords.
 A script to be run before fetching the mail.  The syntax is the same as
 the @code{:program} keyword.  This can also be a function to be run.
 
+One popular way to use this is to set up an SSH tunnel to access the
+@acronym{POP} server.  Here's an example:
+
+@lisp
+(pop :server "127.0.0.1"
+     :port 1234
+     :user "foo"
+     :password "secret"
+     :prescript
+     "nohup ssh -f -L 1234:pop.server:110 remote.host sleep 3600 &")
+@end lisp
+
 @item :postscript
 A script to be run after fetching the mail.  The syntax is the same as
 the @code{:program} keyword.  This can also be a function to be run.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7c83b9d99de..827ccc730db 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+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.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index deaef1d3f25..7af8e31f792 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -153,16 +153,17 @@ DOM should be a parse tree as generated by
     (shr-remove-trailing-whitespace start (point))))
 
 (defun shr-remove-trailing-whitespace (start end)
-  (save-restriction
-    (narrow-to-region start end)
-    (delete-trailing-whitespace)
-    (goto-char start)
-    (while (not (eobp))
-      (end-of-line)
-      (dolist (overlay (overlays-at (point)))
-        (when (overlay-get overlay 'before-string)
-          (overlay-put overlay 'before-string nil)))
-      (forward-line 1))))
+  (let ((width (window-width)))
+    (save-restriction
+      (narrow-to-region start end)
+      (goto-char start)
+      (while (not (eobp))
+        (end-of-line)
+        (when (> (current-column) width)
+          (dolist (overlay (overlays-at (point)))
+            (when (overlay-get overlay 'before-string)
+              (overlay-put overlay 'before-string nil))))
+        (forward-line 1)))))
 
 (defun shr-copy-url ()
   "Copy the URL under point to the kill ring.