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 (file)
--- 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)