From: okada <okada>
Date: Wed, 13 Nov 2002 02:33:57 +0000 (+0000)
Subject: Synch up with flim-1_14.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=647150d2f577d4131900b7cf29880e34f1c4cea8;p=elisp%2Fflim.git

Synch up with flim-1_14.
---

diff --git a/ChangeLog b/ChangeLog
index 2bfa0b5..35dd964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2002-11-06  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* mime-parse.el (mime-parse-buffer): Require mmbuffer.
+
+2002-09-26  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* luna.el (luna-define-method): Clear method cache of child
+	classes.
+
+2002-09-24  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* mime-ja.texi (CVS): Escape @.
+
+	* luna.el (luna-define-method): Fix the bug that method cache is
+	not cleard.
+
+2002-09-14  KOSEKI Yoshinori  <kose@meadowy.org>
+
+	* mime-en.texi (CVS): Fix Typo. (@ to @@).
+	mime-ja.texi (CVS): Ditto.
+
 2002-08-26  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
 	* std11.el: Update Copyright header.
diff --git a/luna.el b/luna.el
index 0199aed..f33b83f 100644
--- a/luna.el
+++ b/luna.el
@@ -164,8 +164,13 @@ The optional 5th BODY is the body of the method."
 	   (sym (luna-class-find-or-make-member
 		 (luna-find-class ',class) ',name))
 	   (cache (get ',name 'luna-method-cache)))
-       (if cache
-	   (unintern ',class cache))
+       (and cache
+	    (fboundp sym)
+	    (mapatoms
+	     (lambda (s)
+	       (if (memq (symbol-function sym) (symbol-value s))
+		   (unintern s cache)))
+	     cache))
        (fset sym func)
        (put sym 'luna-method-qualifier ,method-qualifier))))
 
diff --git a/mime-en.texi b/mime-en.texi
index aff3da6..e04f744 100644
--- a/mime-en.texi
+++ b/mime-en.texi
@@ -1533,13 +1533,13 @@ newest FLIM by the following method.
 @example
 (0) cvs login
 
-    % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root login
+    % cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root login
 
     CVS password: [CR] # NULL string
 
 (1) checkout
 
-    % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root checkout
+    % cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root checkout
 	checkout [-r TAG] flim
 @end example
 
@@ -1548,7 +1548,7 @@ If you would like to join CVS based development, please send mail to
 
 @itemize @bullet
 @item
- <cvs@cvs.m17n.org>
+ <cvs@@cvs.m17n.org>
 @end itemize
 
 @noindent
diff --git a/mime-ja.texi b/mime-ja.texi
index b8840e5..c7520bd 100644
--- a/mime-ja.texi
+++ b/mime-ja.texi
@@ -1529,13 +1529,13 @@ FLIM $B$N(B file $B$O(B CVS $B$r;H$C$F4IM}$5$l$F$$$^$9!#$3$N$?$a!"0J2<$NJ}K
 @example
 (0) cvs login
 
-    % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root login
+    % cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root login
 
     CVS password: [CR] # NULL string
 
 (1) checkout
 
-    % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root checkout
+    % cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root checkout
 	checkout [-r TAG] flim
 @end example
 
@@ -1544,7 +1544,7 @@ CVS $B$rMQ$$$?3+H/$K;22C$7$?$$J}$O(B
 
 @itemize @bullet
 @item
- <cvs@cvs.m17n.org>
+ <cvs@@cvs.m17n.org>
 @end itemize
 
 @noindent
diff --git a/mime-parse.el b/mime-parse.el
index fef2ac3..4d70477 100644
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -496,6 +496,7 @@ If Content-Transfer-Encoding field is not found, return nil."
 (defun mime-parse-buffer (&optional buffer representation-type)
   "Parse BUFFER as a MIME message.
 If buffer is omitted, it parses current-buffer."
+  (require 'mmbuffer)
   (save-excursion
     (if buffer (set-buffer buffer))
     (mime-parse-message (or representation-type