* mm-view.el (mm-inline-text): Bind fill-column.

* gnus-group.el (gnus-group-expire-articles-1): Return the list of
un-expired articles.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eed89c3..8c499ec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2000-08-10 20:22:09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * mm-view.el (mm-inline-text): Bind fill-column.
+
        * nnvirtual.el (nnvirtual-request-expire-articles): Return the
        list of unexpired articles.
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 0f01825..fdb3df8 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3606,7 +3606,7 @@ and the second element is the address."
 
 (defun gnus-add-marked-articles (group type articles &optional info force)
   ;; Add ARTICLES of TYPE to the info of GROUP.
-  ;; If INFO is non-nil, use that info.         If FORCE is non-nil, don't
+  ;; If INFO is non-nil, use that info.  If FORCE is non-nil, don't
   ;; add, but replace marked articles of TYPE with ARTICLES.
   (let ((info (or info (gnus-get-info group)))
        marked m)

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 6b21d71..45ed4d2 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -113,6 +113,9 @@
            (save-window-excursion
              (save-restriction
                (let ((w3-strict-width width)
+                     ;; Don't let w3 set the global version of
+                     ;; this variable.
+                     (fill-column fill-column)
                      (url-standalone-mode t))
                  (condition-case var
                      (w3-region (point-min) (point-max))