Merge flim-1_11_3_9.

diff --git a/ChangeLog b/ChangeLog
index e518a75..ed4066d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1998-10-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
+       * mime-def.el: Avoid compile error when ediff is missing.
+
+\f
+1998-10-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
        * FLIM: Version 1.11.3 (Saidaiji) was released.
 
 1998-10-27  MORIOKA Tomohiko  <morioka@jaist.ac.jp>

diff --git a/mime-def.el b/mime-def.el
index d4a994f..e479011 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -402,13 +402,27 @@ specialized parameter.  (car (car ARGS)) is name of variable and (nth
         ))))
 
 (put 'mm-define-method 'lisp-indent-function 'defun)
-(def-edebug-spec mm-define-method
-  (&define name ((arg symbolp)
-                [&rest arg]
-                [&optional ["&optional" arg &rest arg]]
-                &optional ["&rest" arg]
-                )
-          def-body))
+
+(eval-when-compile
+  (defmacro eval-module-depended-macro (module definition)
+    (condition-case nil
+       (progn
+         (require (eval module))
+         definition)
+      (error `(eval-after-load ,(symbol-name (eval module)) ',definition))
+      ))
+  )
+
+(eval-module-depended-macro
+ 'edebug
+ (def-edebug-spec mm-define-method
+   (&define name ((arg symbolp)
+                 [&rest arg]
+                 [&optional ["&optional" arg &rest arg]]
+                 &optional ["&rest" arg]
+                 )
+           def-body))
+ )
 
 (defsubst mm-arglist-to-arguments (arglist)
   (let (dest)