From: yamaoka <yamaoka>
Date: Fri, 23 Jan 2004 06:06:16 +0000 (+0000)
Subject: Reload sha1-el provided by FLIM when an old version (maybe provided by the
X-Git-Tag: t-gnus-6_17_4-quimby-~1107
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e192fe20856e4fec637d3299ab02f9afb31b56;p=elisp%2Fgnus.git-

Reload sha1-el provided by FLIM when an old version (maybe provided by the
 XEmacs ecrypt package) was loaded.
---

diff --git a/lisp/canlock.el b/lisp/canlock.el
index 20376a9..6bdcd3b 100644
--- a/lisp/canlock.el
+++ b/lisp/canlock.el
@@ -44,7 +44,15 @@
 (eval-when-compile
   (require 'cl))
 
-(require 'sha1-el)
+(eval-and-compile
+  (require 'sha1-el)
+  (condition-case nil
+      (sha1 "" nil nil 'binary)
+    (wrong-number-of-arguments
+     (let ((mel (locate-library "mel")))
+       (when mel
+	 (load (expand-file-name "sha1-el" (file-name-directory mel))
+	       nil t))))))
 
 (autoload 'mail-fetch-field "mail-utils")
 (defvar mail-header-separator)