[Emacs-diffs] /srv/bzr/emacs/trunk r107168: Merge changes made in No Gnus

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107168
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2012-02-07 22:17:11 +0000
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-02-01 09:00:42 +0000
+++ b/doc/misc/ChangeLog        2012-02-07 22:17:11 +0000
@@ -1,3 +1,8 @@
+2012-02-07  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * gnus.texi (Agent Basics): Fix outdated description of

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2012-01-30 23:30:22 +0000
+++ b/doc/misc/gnus.texi        2012-02-07 22:17:11 +0000
@@ -14751,6 +14751,18 @@
 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
address@hidden server.  Here's an example:
+
address@hidden
+(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 &")
address@hidden 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.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-07 06:33:51 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-07 22:17:11 +0000
@@ -1,3 +1,9 @@
+2012-02-07  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-sum.el (gnus-summary-show-thread): Revert last two changes.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2012-02-07 00:42:21 +0000
+++ b/lisp/gnus/shr.el  2012-02-07 22:17:11 +0000
@@ -153,16 +153,17 @@
     (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.