From: okada <okada>
Date: Wed, 12 Jul 2000 04:48:15 +0000 (+0000)
Subject: fix
X-Git-Tag: slim-1_14_0~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9e501df5f68f9ad8681fdad27a01daa14b2b7063;p=elisp%2Fflim.git

fix
---

diff --git a/ChangeLog b/ChangeLog
index 6a8ae15..437c6d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-12  Kenichi OKADA <okada@opaopa.org>
+
+	* md5-dl.el (TopLevel): Define-maybe
+	`md5-string', `dynamic-link' and `dynamic-call'.
+	* sha1-dl.el (TopLevel): Define-maybe `dynamic-link' and `dynamic-call'.
+	* md5-el.el (TopLevel): Provide `md5-el' instead of `md5'.
+	* md5.el (TopLevel): Require `md5-el' and `md5-dl'.
+
 2000-06-27  Kenichi OKADA <okada@opaopa.org>
 
 	* smtp.el (smtp-via-smtp): additional HELO for sendmail warning.
diff --git a/md5-dl.el b/md5-dl.el
index 4bc12bf..72078c5 100644
--- a/md5-dl.el
+++ b/md5-dl.el
@@ -26,6 +26,11 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (defun-maybe md5-string (a))
+  (defun-maybe dynamic-link (a))
+  (defun-maybe dynamic-call (a b)))
+
 (defvar md5-dl-module
   (if (and (fboundp 'md5-string)
 	   (subrp (symbol-function 'md5-string)))
@@ -61,6 +66,5 @@ hash of a portion of OBJECT."
       (md5-region (or beg (point-min)) (or end (point-max))))))
 
 (provide 'md5-dl)
-(provide 'md5)
 
 ;;; md5-dl.el ends here.
diff --git a/md5-el.el b/md5-el.el
index a339cec..e7374d8 100644
--- a/md5-el.el
+++ b/md5-el.el
@@ -405,4 +405,4 @@ hash of a portion of OBJECT."
 	    (kill-buffer buffer)))
       (and buffer (buffer-name buffer) (kill-buffer buffer) nil))))
 
-(provide 'md5)
+(provide 'md5-el)
diff --git a/md5.el b/md5.el
index 634b2f0..55c658b 100644
--- a/md5.el
+++ b/md5.el
@@ -58,8 +58,10 @@
  ((and (fboundp 'dynamic-link)
        (file-exists-p (expand-file-name "md5.so" exec-directory)))
   ;; Emacs with DL patch.
-  (require 'md5 "md5-dl"))
+  (require 'md5-dl))
  (t
-  (require 'md5 "md5-el")))
+  (require 'md5-el)))
+
+(provide 'md5)
 
 ;;; md5.el ends here.
diff --git a/sha1-dl.el b/sha1-dl.el
index 06f51a2..7edccdd 100644
--- a/sha1-dl.el
+++ b/sha1-dl.el
@@ -27,7 +27,10 @@
 ;;; Code:
 
 (provide 'sha1-dl)			; beware of circular dependency.
-(eval-when-compile (require 'sha1))	; sha1-dl-module.
+(eval-when-compile
+  (require 'sha1)			; sha1-dl-module.
+  (defun-maybe dynamic-link (a))
+  (defun-maybe dynamic-call (a b)))
 
 (defvar sha1-dl-handle
   (and (stringp sha1-dl-module)