* mailcap.el (mailcap-mime-data): Use enriched-decode.

	* gnus-cite.el (gnus-article-fill-cited-article): Bind
	use-hard-newlines to nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7aa0d1e..60d7358 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2002-02-12  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * mailcap.el (mailcap-mime-data): Use enriched-decode.
+
+       * gnus-cite.el (gnus-article-fill-cited-article): Bind
+       use-hard-newlines to nil.
+
        * gnus-xmas.el (gnus-xmas-image-type-available-p): Assume that
        image is not available if window-system is not available.
 

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 6a09a47..1c5e424 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -441,7 +441,8 @@ If WIDTH (the numerical prefix), use that text width when filling."
                 (concat "^" (regexp-quote (cdar marks)) " *"))
                (fill-prefix
                 (if (string= (cdar marks) "") ""
-                  (concat (cdar marks) " "))))
+                  (concat (cdar marks) " ")))
+               use-hard-newlines)
            (fill-region (point-min) (point-max)))
          (set-marker (caar marks) nil)
          (setq marks (cdr marks)))

diff --git a/lisp/mailcap.el b/lisp/mailcap.el
index 52e5c9a..c5795b1 100644 (file)
--- a/lisp/mailcap.el
+++ b/lisp/mailcap.el
@@ -223,7 +223,7 @@
       (viewer  . fundamental-mode)
       (type    . "text/plain"))
      ("enriched"
-      (viewer . enriched-decode-region)
+      (viewer . enriched-decode)
       (test   . (fboundp 'enriched-decode))
       (type   . "text/enriched"))
      ("html"