shr.el (shr-find-fill-point): Don't break a line after a kinsoku-bol character if a non-breakable character follows.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0e34fbc5f64..c0446207028 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * shr.el (shr-find-fill-point): Don't break a line after a kinsoku-bol
+        character if a non-breakable character follows.
+
 2010-12-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * proto-stream.el (proto-stream-open-tls): Return nil if we don't get
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index fafe3d94dea..4f3af112a32 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -304,8 +304,8 @@ redirects somewhere else."
                     (if (eq (preceding-char) ?')
                         (not (memq (char-after (- (point) 2))
                                    (list nil ?\n ? )))
-                      ;; There're some kinsoku CJK chars that aren't breakable.
                       (and (shr-char-kinsoku-bol-p (preceding-char))
+                           (shr-char-breakable-p (following-char))
                            (not (shr-char-kinsoku-bol-p (following-char)))))
                     (shr-char-kinsoku-eol-p (following-char))))
       (backward-char 1))