Synch to flim-1_14.

diff --git a/ChangeLog b/ChangeLog
index b6b9d9f..2c1038d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-24  Len Trigg  <lenbok@myrealbox.com>
+
+       * mime-conf.el (mime-format-mailcap-command): Quote a file name
+       which may contain spaces using `shell-quote-argument' in order to
+       pass it to the shell safely.
+
 2004-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * eword-encode.el (mime-encode-header-in-buffer): Don't ignore a

diff --git a/mime-conf.el b/mime-conf.el
index 0550893..e2dbf77 100644 (file)
--- a/mime-conf.el
+++ b/mime-conf.el
@@ -1,6 +1,6 @@
 ;;; mime-conf.el --- mailcap parser and MIME playback configuration
 
-;; Copyright (C) 1997,1998,1999,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997,1998,1999,2000,2004 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Created: 1997-06-27
@@ -222,7 +222,7 @@ may be:
                            (error "'filename is not specified in situation.")
                          (setq dest (concat dest
                                             (substring mtext p (1- i))
-                                            file)
+                                            (shell-quote-argument file))
                                i (1+ i)
                                p i)
                          )))