[gnus git] branch master updated: =2= Protect against backends (i.e., nnimap) returning nil as the article number. ; * flow-fill.el (fill-flowed): Make `delete-space' option correspond to "DelSp" parameter in RFC3676.

       via  0096f165f4beeb69a01302e716cbdd9c9b2c301e (commit)
       via  517841400a24e398332b0e769c95f0d57ecae7a4 (commit)
      from  f2f6e1e4a2f6e7d4add61e43ba92732fe8c58dbf (commit)


- Log -----------------------------------------------------------------
commit 0096f165f4beeb69a01302e716cbdd9c9b2c301e
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sat Jan 22 20:53:12 2011 +0100

    Protect against backends (i.e., nnimap) returning nil as the article number.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b615cd..53a0071 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-22  Lars Ingebrigtsen  <[email protected]>
+
+	* gnus-sum.el (gnus-summary-move-article): Protect against backends
+	(i.e., nnimap) returning nil as the article number.
+
 2011-01-22  Kazuhiro Ito  <[email protected]>
 
 	* flow-fill.el (fill-flowed): Make `delete-space' option correspond to
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 2d9986c..101396c 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9836,7 +9836,8 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
 	    (unless (member to-group to-groups)
 	      (push to-group to-groups))
 
-	    (unless (memq article gnus-newsgroup-unreads)
+	    (when (and (not (memq article gnus-newsgroup-unreads))
+		       (cdr art-group))
 	      (push 'read to-marks)
 	      (gnus-info-set-read
 	       info (gnus-add-to-range (gnus-info-read info)
@@ -9853,14 +9854,16 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
 
 	      ;; Enter the article into the cache in the new group,
 	      ;; if that is required.
-	      (when gnus-use-cache
+	      (when (and to-article
+			 gnus-use-cache)
 		(gnus-cache-possibly-enter-article
 		 to-group to-article
 		 (memq article gnus-newsgroup-marked)
 		 (memq article gnus-newsgroup-dormant)
 		 (memq article gnus-newsgroup-unreads)))
 
-	      (when gnus-preserve-marks
+	      (when (and gnus-preserve-marks
+			 to-article)
 		;; Copy any marks over to the new group.
 		(when (and (equal to-group gnus-newsgroup-name)
 			   (not (memq article gnus-newsgroup-unreads)))

commit 517841400a24e398332b0e769c95f0d57ecae7a4
Author: Kazuhiro Ito <[email protected]>
Date:   Sat Jan 22 20:48:19 2011 +0100

    * flow-fill.el (fill-flowed): Make `delete-space' option correspond to
    "DelSp" parameter in RFC3676.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db5792b..7b615cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-22  Kazuhiro Ito  <[email protected]>
+
+	* flow-fill.el (fill-flowed): Make `delete-space' option correspond to
+	"DelSp" parameter in RFC3676.
+
 2011-01-22  Lars Ingebrigtsen  <[email protected]>
 
 	* message.el (message-check-recipients): Display the encoded version of
diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index 66422d2..76339c0 100644
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -124,8 +124,6 @@ RFC 2646 suggests 66 characters for readability."
       (forward-line 1))
     (goto-char (point-min))
     (while (re-search-forward " $" nil t)
-      (when delete-space
-	(delete-char -1))
       (when (save-excursion
 	      (beginning-of-line)
 	      (looking-at "^\\(>*\\)\\( ?\\)"))
@@ -153,6 +151,8 @@ RFC 2646 suggests 66 characters for readability."
 	      (replace-match (if (string= (match-string 2) " ")
 				 "" "\\2")))
 	    (backward-delete-char -1)
+	    (when delete-space
+	      (delete-char -1))
 	    (end-of-line))
 	  (unless sig
 	    (condition-case nil

-----------------------------------------------------------------------
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    |   10 ++++++++++
 lisp/flow-fill.el |    4 ++--
 lisp/gnus-sum.el  |    9 ++++++---
 3 files changed, 18 insertions(+), 5 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