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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4bbf35..bb4f914 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/shr.el b/lisp/shr.el
index fafe3d9..4f3af11 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/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))