From: okada Date: Wed, 12 Jul 2000 04:53:02 +0000 (+0000) Subject: sync up flim-chao-1_14_1 X-Git-Tag: slim-1_14_0~2 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6c65dcd0219705555de28593a6d2f9a22a928c2;p=elisp%2Fflim.git sync up flim-chao-1_14_1 --- diff --git a/ChangeLog b/ChangeLog index 437c6d1..18ee3d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,17 @@ * md5-el.el (TopLevel): Provide `md5-el' instead of `md5'. * md5.el (TopLevel): Require `md5-el' and `md5-dl'. +2000-07-10 MORIOKA Tomohiko + + * mmexternal.el (initialize-instance): Deleted. + (mmexternal-require-file-name): New function. + (mmexternal-require-buffer): Use `mmexternal-require-file-name'. + +2000-06-30 MORIOKA Tomohiko + + * mime.el (mime-entity-read-field): Fix a bug when FIELD-NAME is a + string. + 2000-06-27 Kenichi OKADA * smtp.el (smtp-via-smtp): additional HELO for sendmail warning. diff --git a/Makefile b/Makefile index 6c4ad57..396fae0 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,10 @@ # Makefile for FLIM. # +<<<<<<< Makefile PACKAGE = slim API = 1.14 -RELEASE = 0 +RELEASE = 1 TAR = tar RM = /bin/rm -f @@ -25,8 +26,9 @@ GOMI = *.elc \ FILES = README.?? Makefile FLIM-MK FLIM-CFG FLIM-ELS *.el ChangeLog VERSION = $(API).$(RELEASE) -ARC_DIR = /ftp/pub/mule/flim/flim-$(API) -SEMI_ARC_DIR = /ftp/pub/mule/semi/semi-1.14-for-flim-$(API) +ARC_DIR_PREFIX = /home/tomo/public_html/comp/emacsen/lisp +ARC_DIR = $(ARC_DIR_PREFIX)/flim/flim-$(API) +SEMI_ARC_DIR = $(ARC_DIR_PREFIX)/semi/semi-1.14-for-flim-$(API) elc: $(EMACS) $(FLAGS) -f compile-flim $(PREFIX) $(LISPDIR) \ diff --git a/VERSION b/VERSION index 6719e47..4e453c7 100644 --- a/VERSION +++ b/VERSION @@ -89,3 +89,4 @@ 1.13.0 JR Fujinomori JR $(BF#?9(B 1.14.0 Momoyama $(BEm;3(B 1.14.1 Rokujiz-Dò-A $(BO;COB"(B +------ Kohata $(BLZH((B diff --git a/ftp.in b/ftp.in index 1d17d2a..391fb8a 100644 --- a/ftp.in +++ b/ftp.in @@ -2,18 +2,14 @@ It is available from - ftp://ftp.m17n.org/pub/mule/flim/flim-API + http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/flim/flim-API/ -or - - ftp://ftp.etl.go.jp/pub/mule/flim/flim-API - ---[[message/external-body; - access-type=anon-ftp; - site="ftp.m17n.org"; - directory="/pub/mule/flim/flim-API"; - name="PACKAGE-VERSION.tar.gz"; - mode=image]] +--[[message/external-body; access-type=URL; + URL*0="http://"; + URL*1="www.kanji.zinbun.kyoto-u.ac.jp/~tomo/"; + URL*2="comp/emacsen/lisp/"; + URL*3="flim/flim-API/"; + URL*4="PACKAGE-VERSION.tar.gz"]] Content-Type: application/octet-stream; name="PACKAGE-VERSION.tar.gz"; type=tar; diff --git a/mime.el b/mime.el index 0f9ea4a..328d599 100644 --- a/mime.el +++ b/mime.el @@ -321,7 +321,7 @@ If MESSAGE is specified, it is regarded as root entity." (prog1 field-name (setq field-name (symbol-name field-name))) - (capitalize (capitalize field-name))))) + (intern (capitalize (capitalize field-name)))))) (cond ((eq sym 'Content-Type) (mime-entity-content-type entity) ) diff --git a/mmexternal.el b/mmexternal.el index b7befaf..04e5649 100644 --- a/mmexternal.el +++ b/mmexternal.el @@ -38,44 +38,49 @@ ;; entity are in the body of the parent entity. ) -(luna-define-method initialize-instance :after ((entity mime-external-entity) - &rest init-args) - (or (mime-external-entity-body-file-internal entity) - (let* ((ct (mime-entity-content-type - (mime-entity-parent-internal entity))) - (access-type (mime-content-type-parameter ct "access-type"))) - (if (and access-type - (string= access-type "anon-ftp")) - (let ((site (mime-content-type-parameter ct "site")) - (directory (mime-content-type-parameter ct "directory")) - (name (mime-content-type-parameter ct "name"))) - (mime-external-entity-set-body-file-internal - entity - (expand-file-name - name - (concat "/anonymous@" site ":" directory))))))) - entity) - (luna-define-method mime-entity-name ((entity mime-external-entity)) (concat "child of " (mime-entity-name (mime-entity-parent-internal entity)))) +(defun mmexternal-require-file-name (entity) + (condition-case nil + (or (mime-external-entity-body-file-internal entity) + (let* ((ct (mime-entity-content-type + (mime-entity-parent-internal entity))) + (access-type + (mime-content-type-parameter ct "access-type"))) + (if (and access-type + (string= access-type "anon-ftp")) + (let ((site (mime-content-type-parameter ct "site")) + (directory + (mime-content-type-parameter ct "directory")) + (name (mime-content-type-parameter ct "name"))) + (mime-external-entity-set-body-file-internal + entity + (expand-file-name + name + (concat "/anonymous@" site ":" + (file-name-as-directory directory)))))))) + (error (message "Can't make file-name of external-body.")))) + (defun mmexternal-require-buffer (entity) (unless (and (mime-external-entity-body-buffer-internal entity) (buffer-live-p (mime-external-entity-body-buffer-internal entity))) (condition-case nil - (mime-external-entity-set-body-buffer-internal - entity - (with-current-buffer (get-buffer-create - (concat " *Body of " - (mime-entity-name entity) - "*")) - (insert-file-contents-as-binary - (mime-external-entity-body-file-internal entity)) - (current-buffer))) + (progn + (mmexternal-require-file-name entity) + (mime-external-entity-set-body-buffer-internal + entity + (with-current-buffer (get-buffer-create + (concat " *Body of " + (mime-entity-name entity) + "*")) + (insert-file-contents-as-binary + (mime-external-entity-body-file-internal entity)) + (current-buffer)))) (error (message "Can't get external-body.")))))