Synch to No Gnus 200407242210.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6017c7b..7ba6884 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * flow-fill.el (fill-flowed): Remove space stuffing, and only do
+       quotes that actually start with ">" at the beginning of the
+       lines. 
+
 2004-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * rfc2047.el (rfc2047-encode-region): Fix last change.

diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index c800699..e8f0b98 100644 (file)
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -97,10 +97,15 @@ RFC 2646 suggests 66 characters for readability."
   (save-excursion
     (set-buffer (or (current-buffer) buffer))
     (goto-char (point-min))
+    ;; Remove space stuffing.
+    (while (re-search-forward "^ " nil t)
+      (delete-char -1)
+      (forward-line 1))
+    (goto-char (point-min))
     (while (re-search-forward " $" nil t)
       (when (save-excursion
              (beginning-of-line)
-             (looking-at "^\\(>*\\)\\( ?\\)"))
+             (looking-at "^\\(>+\\)\\( ?\\)"))
        (let ((quote (match-string 1))
              sig)
          (if (string= quote "")