From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Wed, 13 Oct 2010 18:59:08 +0000 (+0200)
Subject: Use a filling algorithm that should probably work for CJVK text, too.
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=c4c7fe99195a53c63df32717dce0da403ca0c58e;ds=sidebyside

Use a filling algorithm that should probably work for CJVK text, too.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2fb550fe8..a2a94c78d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* shr.el (shr-find-fill-point): Use a filling algorithm that should
+	probably work for CJVK text, too.
+
 	* nnimap.el (nnimap-extend-tls-programs): Removed.
 	(nnimap-open-connection): Bind STARTTLS to openssl explicitly.
 
diff --git a/lisp/shr.el b/lisp/shr.el
index 8991533a9..1cdd6a71f 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -219,8 +219,8 @@ redirects somewhere else."
 	(unless shr-start
 	  (setq shr-start (point)))
 	(insert elem)
-	(when (> (current-column) shr-width)
-	  (if (not (search-backward " " (line-beginning-position) t))
+	(while (> (current-column) shr-width)
+	  (if (not (shr-find-fill-point))
 	      (insert "\n")
 	    (delete-char 1)
 	    (insert "\n")
@@ -236,8 +236,10 @@ redirects somewhere else."
   (let ((found nil))
     (while (and (not found)
 		(not (bolp)))
-      (when (or (eq (preceding-char) ? )
-		(aref fill-find-break-point-function-table (preceding-char)))
+      (when (and (or (eq (preceding-char) ? )
+		     (aref fill-find-break-point-function-table
+			   (preceding-char)))
+		 (<= (current-column) shr-width))
 	(setq found (point)))
       (backward-char 1))
     (or found