Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b38c546..caf64ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-25 21:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-bcklg.el (gnus-backlog-shutdown): Make interactive.
+
+       * mm-decode.el (mm-get-image): Guess then use the type.
+
+       * gnus-art.el (gnus-mime-view-part-as-type): Don't copy cache.
+
 2001-07-25 12:54:00  Danny Siu <dsiu@adobe.com>
        
        * gnus-sum.el (gnus-summary-prepare-threads): Shouldn't do tree

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 9485bf8..929e770 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3809,7 +3809,7 @@ value of the variable `gnus-show-mime' is non-nil."
                            (mm-handle-undisplayer handle)
                            (mm-handle-disposition handle)
                            (mm-handle-description handle)
-                           (mm-handle-cache handle)
+                           nil
                            (mm-handle-id handle)))
       (setq gnus-article-mime-handles
            (mm-merge-handles gnus-article-mime-handles handle))

diff --git a/lisp/gnus-bcklg.el b/lisp/gnus-bcklg.el
index b04a47c..86ef4e5 100644 (file)
--- a/lisp/gnus-bcklg.el
+++ b/lisp/gnus-bcklg.el
@@ -55,6 +55,7 @@
 
 (defun gnus-backlog-shutdown ()
   "Clear all backlog variables and buffers."
+  (interactive)
   (when (get-buffer gnus-backlog-buffer)
     (kill-buffer gnus-backlog-buffer))
   (setq gnus-backlog-hashtb nil

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 84eb07b..236692a 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1048,7 +1048,10 @@ like underscores."
                      ;; Avoid testing `make-glyph' since W3 may define
                      ;; a bogus version of it.
                      (if (fboundp 'create-image)
-                         (create-image (buffer-string) (intern type) 'data-p)
+                         (or
+                          (create-image (buffer-string) nil 'data-p)
+                          (create-image (buffer-string) (intern type)
+                                        'data-p))
                        (cond
                         ((equal type "xbm")
                          ;; xbm images require special handling, since