* mel-q-ccl.el (mel-ccl-256-to-16-table): Accept (illegal) lower

[elisp/flim.git] / mime-conf.el

diff --git a/mime-conf.el b/mime-conf.el
index 84fed40..67f613b 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
@@ -22,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -176,10 +176,8 @@ order.  Otherwise result is not sorted."
 
 
 ;;;###autoload
-(defcustom mime-mailcap-file "~/.mailcap"
-  "*File name of user's mailcap file."
-  :group 'mime
-  :type 'file)
+(defvar mime-mailcap-file "~/.mailcap"
+  "*File name of user's mailcap file.")
 
 ;;;###autoload
 (defun mime-parse-mailcap-file (&optional filename order)
@@ -224,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)
                          )))