* mm-view.el (mm-inline-text): Supply delsp to flow-fill.

* flow-fill.el (fill-flowed): Allow delete-space.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd60356..b2f79ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-view.el (mm-inline-text): Supply delsp to flow-fill. 
+
+       * flow-fill.el (fill-flowed): Allow delete-space.
+
 2006-04-18  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * deuglify.el (gnus-outlook-deuglify-unwrap-min)

diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index 0d099b3..f10bd39 100644 (file)
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -98,7 +98,7 @@ RFC 2646 suggests 66 characters for readability."
       t)))
 
 ;;;###autoload
-(defun fill-flowed (&optional buffer)
+(defun fill-flowed (&optional buffer delete-space)
   (save-excursion
     (set-buffer (or (current-buffer) buffer))
     (goto-char (point-min))
@@ -108,6 +108,8 @@ 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 "^\\(>*\\)\\( ?\\)"))

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 36870af..675d4e3 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -422,7 +422,8 @@
       (save-restriction
        (narrow-to-region b (point))
        (goto-char b)
-       (fill-flowed)
+       (fill-flowed nil (equalp (cdr (assoc 'delsp (mm-handle-type handle)))
+                                "yes"))
        (goto-char (point-max))))
     (save-restriction
       (narrow-to-region b (point))