From d298522ccccd908976e45a9de429b6943efc5b2d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 22 Dec 2000 08:10:07 +0000 Subject: [PATCH] Synch with `flim-1_14'. --- ChangeLog | 24 ++++++++++++++++++++ FLIM-API.en | 16 +++++++++++++- FLIM-ELS | 3 ++- VERSION | 2 +- eword-decode.el | 4 ++-- mel-q.el | 4 +++- mmgeneric.el | 4 ++++ raw-io.el | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 raw-io.el diff --git a/ChangeLog b/ChangeLog index c24dfd5..70f0b63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2000-12-22 Keiichi Suzuki + + * mel-q.el: Require `poem' for `string-to-char-list' when + compiling. + +2000-12-22 MORIOKA Tomohiko + + * eword-decode.el (eword-decode-header): Revert to obsolete alias. + +2000-12-22 MORIOKA Tomohiko + + * mmgeneric.el: Add comment for eword-decode. + 2000-12-21 MORIOKA Tomohiko * mailcap.el: Require `poe' for `define-obsolete-function-alias'. @@ -98,11 +111,18 @@ (mime-header-lexical-analyzer): Renamed from `eword-lexical-analyzer'; switch to variable. + * FLIM-ELS (flim-modules): Add `raw-io'. + 2000-12-19 MORIOKA Tomohiko * eword-encode.el (eword-encode-default-start-column): Switch to variable. +2000-12-19 MORIOKA Tomohiko + + * raw-io.el (start-process): New function. + (binary-start-process-shell-command): New function. + 2000-12-17 MORIOKA Tomohiko * mime-parse.el: Require `luna'. @@ -115,6 +135,10 @@ (eword-encode-header): Use `find-charset-region' instead of `find-non-ascii-charset-string'. +2000-12-16 MORIOKA Tomohiko + + * raw-io.el: New file. + 2000-12-15 MORIOKA Tomohiko * mime/eword-decode.el: Don't use diff --git a/FLIM-API.en b/FLIM-API.en index 1705407..623ca7b 100644 --- a/FLIM-API.en +++ b/FLIM-API.en @@ -485,7 +485,8 @@ and return parsed it. ** decoder -[Function] mime-decode-header-in-buffer (&optional code-conversion separator) +[Function] mime-decode-header-in-buffer (&optional code-conversion + separator) Decode MIME encoded-words in header fields. If CODE-CONVERSION is nil, it decodes only encoded-words. If it is @@ -498,6 +499,19 @@ and return parsed it. [Suggest] +[Function] [Function] eword-decode-header (&optional code-conversion + separator) + As same as `mime-decode-header-in-buffer', q.v. + + Note that + + (require 'eword-decode) + + is necessary to use this function. + + [Optional] (Usage: cmail 2.61) + + [Function] mime-decode-header-in-region (start end &optional code-conversion) Decode MIME encoded-words in region between START and END. diff --git a/FLIM-ELS b/FLIM-ELS index 679aba5..e25bea5 100644 --- a/FLIM-ELS +++ b/FLIM-ELS @@ -12,7 +12,8 @@ mmbuffer mmcooked mmdbuffer mmexternal mime-conf sasl sasl-cram sasl-digest - smtp qmtp smtpmail)) + smtp qmtp smtpmail + raw-io)) (setq flim-version-specific-modules '(mailcap)) diff --git a/VERSION b/VERSION index 25cd388..eacced1 100644 --- a/VERSION +++ b/VERSION @@ -49,7 +49,7 @@ 1.13.1 Tawaramoto $(BED86K\(B ; <=> $(B6aE4(B $(B@>ED86K\(B 1.13.2 Kasanui $(B3^K%(B 1.14.0 Ninokuchi $(B?7%N8}(B ------- Yagi $(BH,LZ(B ; = $(B6aE4(B $(BBg:e@~(B +1.14.1 Yagi $(BH,LZ(B ; = $(B6aE4(B $(BBg:e@~(B ------ Yagi-Nishiguchi $(BH,LZ@>8}(B ------ Unebigory-Dòmae-A $(B@&K58fNMA0(B ------ Kashiharajingu-mae $(B3`86?@5\A0(B ; = $(B6aE4(B $(BFnBg:e@~!"5HLn@~(B diff --git a/eword-decode.el b/eword-decode.el index 21ed55c..6a3b447 100644 --- a/eword-decode.el +++ b/eword-decode.el @@ -461,8 +461,8 @@ If SEPARATOR is not nil, it is used as header separator." (point-max))) code-conversion)) -;; (define-obsolete-function-alias 'eword-decode-header -;; 'mime-decode-header-in-buffer) +(defalias 'eword-decode-header 'mime-decode-header-in-buffer) +(make-obsolete 'eword-decode-header 'mime-decode-header-in-buffer) ;;; @ encoded-word decoder diff --git a/mel-q.el b/mel-q.el index 44b83c9..a5830d2 100644 --- a/mel-q.el +++ b/mel-q.el @@ -27,7 +27,9 @@ (require 'mime-def) (require 'path-util) - +(eval-when-compile + ;; XXX: should provide char-list instead of string-to-char-list. + (require 'poem)) ;;; @ Quoted-Printable encoder ;;; diff --git a/mmgeneric.el b/mmgeneric.el index 307e472..ff44bb1 100644 --- a/mmgeneric.el +++ b/mmgeneric.el @@ -26,6 +26,10 @@ (require 'luna) +(eval-when-compile + (require 'eword-decode) ; mime-find-field-presentation-method + ) + ;;; @ MIME entity ;;; diff --git a/raw-io.el b/raw-io.el new file mode 100644 index 0000000..0074dea --- /dev/null +++ b/raw-io.el @@ -0,0 +1,65 @@ +;;; raw-io.el --- input/output without code-conversion + +;; Copyright (C) 1997,1998,1999,2000 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Keywords: definition, MIME, multimedia, mail, news + +;; This file is part of APEL (A Portable Emacs Library). + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; 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. + +;;; Code: + +(eval-when-compile (require 'static)) +(require 'pces) + +(static-if (and (featurep 'xemacs) + (not (featurep 'utf-2000))) + (defalias 'binary-insert-file-contents 'insert-file-contents-as-binary) + (defalias 'binary-insert-file-contents 'insert-file-contents-literally)) + +(defalias 'binary-write-region 'write-region-as-binary) + +(defalias 'binary-find-file-noselect 'find-file-noselect-as-binary) + +(defalias 'binary-open-network-stream 'open-network-stream-as-binary) + +(defun binary-start-process (name buffer program &rest program-args) + "Like `start-process', q.v., but don't code conversion." + (as-binary-process + (apply (function start-process) name buffer program program-args))) + +(defun binary-start-process-shell-command (name buffer &rest args) + "Like `start-process-shell-command', q.v., but don't code conversion." + (static-if (fboundp 'start-process-shell-command) + (as-binary-process + (apply (function start-process-shell-command) name buffer args)) + (as-binary-process + (start-process name buffer shell-file-name shell-command-switch + (mapconcat #'identity args " "))))) + +(defalias 'raw-text-insert-file-contents 'insert-file-contents-as-raw-text) + +(defalias 'raw-message-write-region 'write-region-as-raw-text-CRLF) + + +;;; @ end +;;; + +(provide 'raw-io) + +;;; raw-io.el ends here -- 1.7.10.4