[gnus git] branch master updated: m0-3-108-g3c88a10 =1= shr.el (shr-find-fill-point): Don't break a line within kinsoku-eol characters.

Katsumi Yamaoka <[email protected]>
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  3c88a106d0b10ed0e0763103f98a22b681c7715c (commit)
      from  2dcbc9ada5ed5213959b54678a333e5d7ad4d4f8 (commit)


- Log -----------------------------------------------------------------
commit 3c88a106d0b10ed0e0763103f98a22b681c7715c
Author: Katsumi Yamaoka <[email protected]>
Date:   Mon Apr 2 10:11:08 2012 +0000

    shr.el (shr-find-fill-point): Don't break a line within kinsoku-eol characters.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e14048..3db5817 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2012-04-02  Katsumi Yamaoka  <[email protected]>
 
-	* shr.el (shr-find-fill-point): Don't break a line before kinsoku-bol
-	characters.
+	* shr.el (shr-find-fill-point): Remove unused code; don't break a line
+	before kinsoku-bol characters and within kinsoku-eol characters.
 
 2012-03-27  Katsumi Yamaoka  <[email protected]>
 
diff --git a/lisp/shr.el b/lisp/shr.el
index 4ee573f..ce98ab8 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -444,9 +444,7 @@ size, and full-buffer size."
 			 (shr-char-kinsoku-eol-p (following-char)))))
 	   (goto-char bp)))
 	((shr-char-kinsoku-eol-p (preceding-char))
-	 (if (shr-char-kinsoku-eol-p (following-char))
-	     ;; There are consecutive kinsoku-eol characters.
-	     (setq failed t)
+	 ;; Find backward the point where kinsoku-eol characters begin.
 	   (let ((count 4))
 	     (while
 		 (progn
@@ -460,23 +458,15 @@ size, and full-buffer size."
 	       ;; so we go to the second best position.
 	       (if (looking-at "\\(\\c<+\\)\\c<")
 		   (goto-char (match-end 1))
-		 (forward-char 1)))))
+	       (forward-char 1))))
 	((shr-char-kinsoku-bol-p (following-char))
 	 ;; Find forward the point where kinsoku-bol characters end.
 	 (let ((count 4))
-	   (while (and (>= (setq count (1- count)) 0)
-		       (shr-char-kinsoku-bol-p (following-char))
-		       (shr-char-breakable-p (following-char)))
-	     (forward-char 1))))
-	(t
-	 (if (shr-char-kinsoku-bol-p (preceding-char))
-	     ;; There are consecutive kinsoku-bol characters.
-	     (setq failed t)
-	   (let ((count 4))
-	     (while (and (>= (setq count (1- count)) 0)
+	   (while (progn
+		    (forward-char 1)
+		    (and (>= (setq count (1- count)) 0)
 			 (shr-char-kinsoku-bol-p (following-char))
-			 (shr-char-breakable-p (following-char)))
-	       (forward-char 1))))))
+			 (shr-char-breakable-p (following-char))))))))
        (when (eq (following-char) ? )
 	 (forward-char 1))))
     (not failed)))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    4 ++--
 lisp/shr.el    |   48 +++++++++++++++++++-----------------------------
 2 files changed, 21 insertions(+), 31 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.