bug#7596: 23.2.90; fill-flowed with DELETE-SPACE option does not work

[Kazuhiro Ito <kzhr@d1.dion.ne.jp>]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

When I start emacs (emacs-23 branch) with -Q and evaluate below code,
I receive unexpected result.

(with-temp-buffer
  (insert "ABC \nDEF")
  (fill-flowed nil t)
  (buffer-string))

It returns 

"ABC
DEF"

But I expect 

"ABCDEF"


I expect DELETE-SPACE option corresponds to "DelSp" parameter in
RFC3676 and works so.  Plesse see attached patch.

-- 
Kazuhiro Ito

[-- Attachment #2: flow-fill.el.diff --]
[-- Type: application/octet-stream, Size: 654 bytes --]

=== modified file 'lisp/gnus/flow-fill.el'
--- lisp/gnus/flow-fill.el	2010-01-13 08:35:10 +0000
+++ lisp/gnus/flow-fill.el	2010-12-08 10:14:13 +0000
@@ -106,8 +106,6 @@
       (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 "^\\(>*\\)\\( ?\\)"))
@@ -135,6 +133,8 @@
 	      (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