More hack for FSF Emacs

diff --git a/ChangeLog b/ChangeLog
index 3b2faf3..32b24ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-18  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+       * mime-view.el (mime-display-gzipped): Temporaly hack for FSF Emacs
+       until new FLIM is released.
+
 2000-03-16  Yoshiki Hayashi  <yoshiki@xemacs.org>
 
        * mime-view.el (mime-display-gzipped): Make it FSF Emacs friendly.

diff --git a/mime-view.el b/mime-view.el
index b7eb7f0..09f0134 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -852,10 +852,14 @@ This can only handle gzipped contents."
   "Ungzip gzipped part and display."
     (insert
      (with-temp-buffer
-       ;; I really hate this brain-damaged function.
-       (when (fboundp 'set-buffer-multibyte)
-        (set-buffer-multibyte nil))
-       (insert (mime-entity-content entity))
+       ;; #### Kludge to make FSF Emacs happy.
+       (if (featurep 'xemacs)
+          (insert (mime-entity-content entity))
+        (let ((content (mime-entity-content entity)))
+          (if (not (multibyte-string-p content))
+              ;; I really hate this brain-damaged function.
+              (set-buffer-multibyte nil))
+          (insert content)))
        (as-binary-process
        (call-process-region (point-min) (point-max) "gzip" t t
                             nil "-cd"))