Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 787179c..953df78 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-05  Simon Josefsson  <jas@extundo.com>
+
+       * mm-decode.el (mm-handle-set-external-undisplayer): Don't
+       generate compiler warnings.  From Alex Schroeder <alex@gnu.org>.
+
 2001-06-04  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * mm-decode.el (mm-pipe-part): Bind coding-system-for-write to

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 61bc805..0ca7321 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -364,21 +364,16 @@ The original alist is not modified.  See also `destructive-alist-to-plist'."
 (defun mm-handle-set-external-undisplayer (handle function)
  "Set the undisplayer for this handle; postpone undisplaying of viewers
 for types in mm-keep-viewer-alive-types."
-  (if (mm-keep-viewer-alive-p handle)
-    (progn
-     (setq new-handle (copy-sequence handle))
-     (mm-handle-set-undisplayer new-handle function)
-     (mm-handle-set-undisplayer handle nil)
-     (push new-handle mm-postponed-undisplay-list)
-    )
-  (mm-handle-set-undisplayer handle function)
-  )
-)
+ (if (mm-keep-viewer-alive-p handle)
+     (let ((new-handle (copy-sequence handle)))
+       (mm-handle-set-undisplayer new-handle function)
+       (mm-handle-set-undisplayer handle nil)
+       (push new-handle mm-postponed-undisplay-list))
+   (mm-handle-set-undisplayer handle function)))
 
 (defun mm-destroy-postponed-undisplay-list ()
   (message "Destroying external MIME viewers")
-  (mm-destroy-parts mm-postponed-undisplay-list)
-)
+  (mm-destroy-parts mm-postponed-undisplay-list))
 
 (defun mm-dissect-buffer (&optional no-strict-mime)
   "Dissect the current buffer and return a list of MIME handles."