* mel-q.el (quoted-printable-external-decoder-option-to-specify-file):

Accept nil.
(mime-write-decoded-region): If the value of the variable
`quoted-printable-external-decoder-option-to-specify-file' is nil,
write stdout to the output file.

* mel-b-el.el (base64-external-decoder-option-to-specify-file):
Accept nil.
(base64-write-decoded-region): If the value of the variable
`base64-external-decoder-option-to-specify-file' is nil, write
stdout to the output file.

diff --git a/ChangeLog b/ChangeLog
index cda5da5..4cc011b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-01-27  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * mel-q.el (quoted-printable-external-decoder-option-to-specify-file): 
+       Accept nil.
+       (mime-write-decoded-region): If the value of the variable
+       `quoted-printable-external-decoder-option-to-specify-file' is nil,
+       write stdout to the output file.
+
+       * mel-b-el.el (base64-external-decoder-option-to-specify-file): 
+       Accept nil.
+       (base64-write-decoded-region): If the value of the variable
+       `base64-external-decoder-option-to-specify-file' is nil, write
+       stdout to the output file.
+
 2004-01-12  Daiki Ueno  <ueno@unixuser.org>
 
        * sasl.texi: Texinfo markup fixes.  From Jesper Harder
@@ -179,7 +193,7 @@
 \f
 2002-06-03  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
-       * FLIM: Version 1.14.4 (Kashiharajing\e-Dþ-mae)\e-A released.
+       * FLIM: Version 1.14.4 (Kashiharajing\e.D\8eþ-mae) released.
 
 2002-01-16  Hiroya Murata     <lapis-lazuli@pop06.odn.ne.jp>
 
@@ -230,7 +244,7 @@
 \f
 2001-06-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
-       * FLIM: Version 1.14.3 (Unebigory\e-Dòmae)\e-A released.
+       * FLIM: Version 1.14.3 (Unebigory\8eòmae) released.
 
 2001-06-01  Katsumi Yamaoka   <yamaoka@jpl.org>
 
@@ -1292,7 +1306,7 @@
 \f
 2000-07-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
-       * FLIM-Chao: Version 1.14.1 (Rokujiz\e-Dò)\e-A released.
+       * FLIM-Chao: Version 1.14.1 (Rokujiz\8eò) released.
 
 2000-07-10  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
@@ -1910,7 +1924,7 @@
 \f
 1999-05-31  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * FLIM: Version 1.12.7 (Y\e-Dþzaki)\e-A released.
+       * FLIM: Version 1.12.7 (Y\8eþzaki) released.
 
 1999-05-31  MORIOKA Tomohiko  <tomo@m17n.org>
 
@@ -2085,7 +2099,7 @@
 \f
 1999-05-11  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * FLIM: Version 1.12.6 (Family-K\e-Dòenmae)\e-A released.
+       * FLIM: Version 1.12.6 (Family-K\8eòenmae) released.
 
 1999-04-27  Shuhei KOBAYASHI  <shuhei@aqua.ocn.ne.jp>
 
@@ -2202,7 +2216,7 @@
 \f
 1999-01-23  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.12.3 (Kintetsu-K\e-Dòriyama)\e-A released.
+       * FLIM: Version 1.12.3 (Kintetsu-K\8eòriyama) released.
 
 1999-01-23  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2245,7 +2259,7 @@
 \f
 1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.12.2 (Kuj\e-Dò)\e-A released.
+       * FLIM: Version 1.12.2 (Kuj\8eò) released.
 
 1999-01-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2431,7 +2445,7 @@
 \f
 1998-12-02  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.12.1 (Nishinoky\e-Dò)\e-A released.
+       * FLIM: Version 1.12.1 (Nishinoky\8eò) released.
 
 1998-11-30  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2649,7 +2663,7 @@
 \f
 1998-10-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.11.2 (Heij\e-Dò)\e-A was released.
+       * FLIM: Version 1.11.2 (Heij\8eò) was released.
 
        * NEWS (Abolish variable `mime-temp-directory'): New subsection.
 
@@ -2929,7 +2943,7 @@
 \f
 1998-10-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.10.4 (Shin-H\e-Dòsono)\e-A was released.
+       * FLIM: Version 1.10.4 (Shin-H\8eòsono) was released.
 
 1998-10-12  Katsumi Yamaoka   <yamaoka@jpl.org>
 
@@ -3114,7 +3128,7 @@
 \f
 1998-09-29  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.10.0 (K\e-Dòdo)\e-A was released.
+       * FLIM: Version 1.10.0 (K\8eòdo) was released.
 
        * README.en (What's FLIM): Add mel-ccl.el.
 
@@ -3401,7 +3415,7 @@
 \f
 1998-08-31  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.9.1 (Tonosh\e-Dò)\e-A was released.
+       * FLIM: Version 1.9.1 (Tonosh\8eò) was released.
 
        * mime-en.sgml (mm-backend): Translate a little.
 
@@ -3544,7 +3558,7 @@
 \f
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM-Chao: Version 1.8.0 (Shij\e-Dò)\e-A was released.
+       * FLIM-Chao: Version 1.8.0 (Shij\8eò) was released.
 
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -3656,7 +3670,7 @@
 \f
 1998-07-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.8.0 (\e-DÒkubo)\e-A was released.
+       * FLIM: Version 1.8.0 (\8eÒkubo) was released.
 
        * README.en: Delete `How to use'.
 
@@ -3781,7 +3795,7 @@
 \f
 1998-06-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM-Chao: Version 1.7.0 (Goj\e-Dò)\e-A was released.
+       * FLIM-Chao: Version 1.7.0 (Goj\8eò) was released.
 
 1998-06-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -4040,7 +4054,7 @@
 \f
 1998-06-19  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.4.1 (Momoyama-Gory\e-Dòmae)\e-A was released.
+       * FLIM: Version 1.4.1 (Momoyama-Gory\8eòmae) was released.
 
 1998-06-18  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -4160,7 +4174,7 @@
 \f
 1998-05-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.2.0 (J\e-Dþjò)\e-A was released.
+       * FLIM: Version 1.2.0 (J\8eþj\8eò) was released.
 
        * README.en (What's FLIM): Delete description about
        std11-parse.el; add description about mailcap.el.
@@ -4211,7 +4225,7 @@
 \f
 1998-05-05  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.1.0 (T\e-Dòji)\e-A was released.
+       * FLIM: Version 1.1.0 (T\8eòji) was released.
 
 1998-05-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -4247,7 +4261,7 @@
 \f
 1998-04-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * FLIM: Version 1.0.1 (Ky\e-Dòto)\e-A was released.
+       * FLIM: Version 1.0.1 (Ky\8eòto) was released.
 
        * mime-def.el (mime-spadework-module-version-string): New
        constant.

diff --git a/mel-b-el.el b/mel-b-el.el
index f8a13ef..eac60b5 100644 (file)
--- a/mel-b-el.el
+++ b/mel-b-el.el
@@ -50,7 +50,8 @@
   :type '(cons (file :tag "Command")(repeat :tag "Arguments" string)))
 
 (defcustom base64-external-decoder-option-to-specify-file '("-o")
-  "*list of options of base64 decoder program to specify file."
+  "*list of options of base64 decoder program to specify file.
+If the base64 decoder program does not have such option, set this as nil."
   :group 'base64
   :type '(repeat :tag "Arguments" string))
 
@@ -368,13 +369,22 @@ START and END are buffer positions."
   (interactive "*r\nFWrite decoded region to file: ")
   (if (and base64-internal-decoding-limit
           (> (- end start) base64-internal-decoding-limit))
-      (as-binary-process
-       (apply (function call-process-region)
-             start end (car base64-external-decoder)
-             nil nil nil
-             (append (cdr base64-external-decoder)
-                     base64-external-decoder-option-to-specify-file
-                     (list filename))))
+      (progn
+       (as-binary-process
+        (apply (function call-process-region)
+               start end (car base64-external-decoder)
+               (null base64-external-decoder-option-to-specify-file)
+               (unless base64-external-decoder-option-to-specify-file
+                 (list (current-buffer) nil))
+               nil
+               (delq nil
+                     (append
+                      (cdr base64-external-decoder)
+                      base64-external-decoder-option-to-specify-file
+                      (when base64-external-decoder-option-to-specify-file
+                        (list filename))))))
+       (unless base64-external-decoder-option-to-specify-file
+         (write-region-as-binary (point-min) (point-max) filename)))
     (let ((str (buffer-substring start end)))
       (with-temp-buffer
        (insert (base64-internal-decode-string str))

diff --git a/mel-q.el b/mel-q.el
index 4a59b02..5c9f7c5 100644 (file)
--- a/mel-q.el
+++ b/mel-q.el
@@ -254,7 +254,8 @@ the program (maybe mmencode included in metamail or XEmacs package)."
 
 
 (defvar quoted-printable-external-decoder-option-to-specify-file '("-o")
-  "*list of options of quoted-printable decoder program to specify file.")
+  "*list of options of quoted-printable decoder program to specify file.
+If the quoted-printable decoder does not have such option, set this as nil.")
 
 (mel-define-method mime-write-decoded-region (start end filename
                                                    (nil "quoted-printable"))
@@ -264,10 +265,18 @@ START and END are buffer positions."
   (as-binary-process
    (apply (function call-process-region)
          start end (car quoted-printable-external-decoder)
-         nil nil nil
-         (append (cdr quoted-printable-external-decoder)
-                 quoted-printable-external-decoder-option-to-specify-file
-                 (list filename)))))
+         (null quoted-printable-external-decoder-option-to-specify-file)
+         (unless quoted-printable-external-decoder-option-to-specify-file
+           (list (current-buffer) nil))
+         nil
+         (delq nil
+               (append
+                (cdr quoted-printable-external-decoder)
+                quoted-printable-external-decoder-option-to-specify-file
+                (when quoted-printable-external-decoder-option-to-specify-file
+                  (list filename))))))
+  (unless quoted-printable-external-decoder-option-to-specify-file
+    (write-region-as-binary (point-min) (point-max) filename)))
 
 \f
 ;;; @ Q-encoding encode/decode string