From d7b4e1e5db03b02686f8f317afbadceaa2d8d0bd Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 23 Apr 2002 06:37:53 +0000 Subject: [PATCH] Synch with flim-1_14. --- ChangeLog | 45 +++++++++++++++++++++++++-------------------- VERSION | 8 ++++---- luna.el | 12 ++---------- mime-def.el | 4 ++-- 4 files changed, 33 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc448bc..e9314e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2002-02-01 Kenichi OKADA +2002-01-16 Hiroya Murata + + * luna.el (luna-class-find-member): Don't search parents' + method-spaces. + +2002-02-01 Kenichi OKADA * eword-encode.el (mime-header-encode-method-alist): New variable. (mime-encode-field-body): Use `mime-header-encode-method-alist'. @@ -18,7 +23,7 @@ * smtpmail.el (smtpmail-send-it): Work even if the first line of the subject field has no content (synch with Emacs 20.3). -2001-07-30 AMAKAWA Shuhei +2001-07-30 AMAKAWA Shuhei * smtp.el (smtp-submit-package): Send EHLO after starttls. @@ -29,7 +34,7 @@ 2001-06-01 MORIOKA Tomohiko - * FLIM: Version 1.14.3 (Unebigory-Dòmae)-A released. + * FLIM: Version 1.14.3 (Unebigory-Dòmae) released.-A 2001-06-01 Katsumi Yamaoka @@ -1025,7 +1030,7 @@ 2000-07-12 MORIOKA Tomohiko - * FLIM-Chao: Version 1.14.1 (Rokujiz-Dò)-A released. + * FLIM-Chao: Version 1.14.1 (Rokujiz-Dò) released.-A 2000-07-10 MORIOKA Tomohiko @@ -1803,7 +1808,7 @@ 1999-05-31 MORIOKA Tomohiko - * FLIM: Version 1.12.7 (Y-Dþzaki)-A released. + * FLIM: Version 1.12.7 (Y-Dþzaki) released.-A 1999-05-31 MORIOKA Tomohiko @@ -1978,7 +1983,7 @@ 1999-05-11 MORIOKA Tomohiko - * FLIM: Version 1.12.6 (Family-K-Dòenmae)-A released. + * FLIM: Version 1.12.6 (Family-K-Dòenmae) released.-A 1999-04-27 Shuhei KOBAYASHI @@ -2095,7 +2100,7 @@ 1999-01-23 MORIOKA Tomohiko - * FLIM: Version 1.12.3 (Kintetsu-K-Dòriyama)-A released. + * FLIM: Version 1.12.3 (Kintetsu-K-Dòriyama) released.-A 1999-01-23 MORIOKA Tomohiko @@ -2138,7 +2143,7 @@ 1999-01-21 MORIOKA Tomohiko - * FLIM: Version 1.12.2 (Kuj-Dò)-A released. + * FLIM: Version 1.12.2 (Kuj-Dò) released.-A 1999-01-16 MORIOKA Tomohiko @@ -2324,7 +2329,7 @@ 1998-12-02 MORIOKA Tomohiko - * FLIM: Version 1.12.1 (Nishinoky-Dò)-A released. + * FLIM: Version 1.12.1 (Nishinoky-Dò) released.-A 1998-11-30 MORIOKA Tomohiko @@ -2542,7 +2547,7 @@ 1998-10-26 MORIOKA Tomohiko - * FLIM: Version 1.11.2 (Heij-Dò)-A was released. + * FLIM: Version 1.11.2 (Heij-Dò) was released.-A * NEWS (Abolish variable `mime-temp-directory'): New subsection. @@ -2822,7 +2827,7 @@ 1998-10-12 MORIOKA Tomohiko - * FLIM: Version 1.10.4 (Shin-H-Dòsono)-A was released. + * FLIM: Version 1.10.4 (Shin-H-Dòsono) was released.-A 1998-10-12 Katsumi Yamaoka @@ -3007,7 +3012,7 @@ 1998-09-29 MORIOKA Tomohiko - * FLIM: Version 1.10.0 (K-Dòdo)-A was released. + * FLIM: Version 1.10.0 (K-Dòdo) was released.-A * README.en (What's FLIM): Add mel-ccl.el. @@ -3294,7 +3299,7 @@ 1998-08-31 MORIOKA Tomohiko - * FLIM: Version 1.9.1 (Tonosh-Dò)-A was released. + * FLIM: Version 1.9.1 (Tonosh-Dò) was released.-A * mime-en.sgml (mm-backend): Translate a little. @@ -3437,7 +3442,7 @@ 1998-07-07 MORIOKA Tomohiko - * FLIM-Chao: Version 1.8.0 (Shij-Dò)-A was released. + * FLIM-Chao: Version 1.8.0 (Shij-Dò) was released.-A 1998-07-07 MORIOKA Tomohiko @@ -3549,7 +3554,7 @@ 1998-07-01 MORIOKA Tomohiko - * FLIM: Version 1.8.0 (-DÒkubo)-A was released. + * FLIM: Version 1.8.0 (-DÒkubo) was released.-A * README.en: Delete `How to use'. @@ -3674,7 +3679,7 @@ 1998-06-28 MORIOKA Tomohiko - * FLIM-Chao: Version 1.7.0 (Goj-Dò)-A was released. + * FLIM-Chao: Version 1.7.0 (Goj-Dò) was released.-A 1998-06-26 MORIOKA Tomohiko @@ -3933,7 +3938,7 @@ 1998-06-19 MORIOKA Tomohiko - * FLIM: Version 1.4.1 (Momoyama-Gory-Dòmae)-A was released. + * FLIM: Version 1.4.1 (Momoyama-Gory-Dòmae) was released.-A 1998-06-18 MORIOKA Tomohiko @@ -4053,7 +4058,7 @@ 1998-05-06 MORIOKA Tomohiko - * FLIM: Version 1.2.0 (J-Dþjò)-A was released. + * FLIM: Version 1.2.0 (J-Dþjò) was released.-A * README.en (What's FLIM): Delete description about std11-parse.el; add description about mailcap.el. @@ -4104,7 +4109,7 @@ 1998-05-05 MORIOKA Tomohiko - * FLIM: Version 1.1.0 (T-Dòji)-A was released. + * FLIM: Version 1.1.0 (T-Dòji) was released.-A 1998-05-04 MORIOKA Tomohiko @@ -4140,7 +4145,7 @@ 1998-04-17 MORIOKA Tomohiko - * FLIM: Version 1.0.1 (Ky-Dòto)-A was released. + * FLIM: Version 1.0.1 (Ky-Dòto) was released.-A * mime-def.el (mime-spadework-module-version-string): New constant. diff --git a/VERSION b/VERSION index 22a0bc8..23955f1 100644 --- a/VERSION +++ b/VERSION @@ -4,7 +4,7 @@ ;;------------------------------------------------------------------------- ;; Kinki Nippon Railway $(B6a5&F|K\E4F;(B http://www.kintetsu.co.jp/ -;; Ky-Dòto-A Line $(B5~ET@~(B +;; Ky-Dòto Line-A $(B5~ET@~(B ;;------------------------------------------------------------------------- 1.0.1 Ky-Dòto-A $(B5~ET(B ; <=> JR, $(B5~ET;T8rDL6I(B 1.1.0 T-Dòji-A $(BEl;{(B @@ -34,7 +34,7 @@ 1.11.3 Saidaiji $(B@>Bg;{(B ; = $(B6aE4(B $(BF`NI@~(B ;;------------------------------------------------------------------------- ;; Kinki Nippon Railway $(B6a5&F|K\E4F;(B http://www.kintetsu.co.jp/ -;; Ky-Dòto-A Line $(B3`86@~(B +;; Ky-Dòto Line-A $(B3`86@~(B ;;------------------------------------------------------------------------- (Saidaiji) ($(B@>Bg;{(B) 1.12.0 Amagatsuji $(BFt%vDT(B @@ -52,7 +52,7 @@ 1.14.1 Yagi $(BH,LZ(B ; = $(B6aE4(B $(BBg:e@~(B 1.14.2 Yagi-Nishiguchi $(BH,LZ@>8}(B 1.14.3 Unebigory-Dòmae-A $(B@&K58fNMA0(B ------- Kashiharajing-Dþ-mae-A $(B3`86?@5\A0(B ; = $(B6aE4(B $(BFnBg:e@~!"5HLn@~(B +1.14.4 Kashiharajing-Dþ-mae-A $(B3`86?@5\A0(B ; = $(B6aE4(B $(BFnBg:e@~!"5HLn@~(B [Chao Version names] @@ -116,7 +116,7 @@ 1.13.6 Nakanosh-Dò-A $BCf%N>1(B ; $B$N$A$KCf$N>1$K2~>N(B 1.14.0 Gokend-Dò-A $B8^4VF2(B 1.14.3 Terai-Nishikuchi $B;{0f@>8}(B ------- Jid-Dò-Asha-Renraku $B<+F0 ;; Keywords: OOP @@ -115,15 +115,7 @@ The optional 2nd arg SLOTS is a list of slots CLASS will have." (defun luna-class-find-member (class member-name) (or (stringp member-name) (setq member-name (symbol-name member-name))) - (or (intern-soft member-name (luna-class-obarray class)) - (let ((parents (luna-class-parents class)) - ret) - (while (and parents - (null - (setq ret (luna-class-find-member - (luna-find-class (pop parents)) - member-name))))) - ret))) + (intern-soft member-name (luna-class-obarray class))) ;; Return a member (slot or method) of CLASS that has name diff --git a/mime-def.el b/mime-def.el index 1786c61..8d4715a 100644 --- a/mime-def.el +++ b/mime-def.el @@ -1,6 +1,6 @@ ;;; mime-def.el --- definition module about MIME -*- coding: iso-2022-jp; -*- -;; Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc. +;; Copyright (C) 1995,96,97,98,99,2000,2001,2002 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko ;; Shuhei KOBAYASHI @@ -34,7 +34,7 @@ (eval-when-compile (require 'luna)) ; luna-arglist-to-arguments (eval-and-compile - (defconst mime-library-product ["CLIME" (1 14 3) "$B;{0f@>8}(B"] + (defconst mime-library-product ["CLIME" (1 14 4) "$B<+F0