Synch to No Gnus 200401140202.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79fda39..46b3135 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * canlock.el: Always require sha1-el.
+       (canlock-sha1): Bind sha1-maximum-internal-length to nil.
+
+       * message.el: Autoload sha1 only when compiling.
+
+       * lpath.el: Bind eudc-protocol for both Emacs and XEmacs; fbind
+       eudc-expand-inline for XEmacs.
+
 2004-01-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * message.el (message-canlock-generate): Require sha1-el.

diff --git a/lisp/canlock.el b/lisp/canlock.el
index 310c9cf..6df1266 100644 (file)
--- a/lisp/canlock.el
+++ b/lisp/canlock.el
@@ -44,8 +44,8 @@
 (eval-when-compile
   (require 'cl))
 
-(autoload 'sha1 "sha1-el")
-(autoload 'sha1-binary "sha1-el")
+(require 'sha1-el)
+
 (autoload 'base64-encode-string "base64")
 (autoload 'mail-fetch-field "mail-utils")
 (defvar mail-header-separator)
@@ -82,8 +82,9 @@ buffer does not look like a news message."
 (defun canlock-sha1 (message)
   "Make a SHA-1 digest of MESSAGE as a unibyte string of length 20 bytes."
   (condition-case nil
-      (sha1 message nil nil 'binary)
-    (error
+      (let (sha1-maximum-internal-length)
+       (sha1 message nil nil 'binary))
+    (wrong-number-of-arguments
      (canlock-string-as-unibyte (sha1-binary message)))))
 
 (defun canlock-make-cancel-key (message-id password)

diff --git a/lisp/lpath.el b/lisp/lpath.el
index f77d516..920e1e3 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -21,9 +21,10 @@
               url-generic-parse-url url-http-file-exists-p
               url-insert-file-contents vcard-pretty-print w32-focus-frame
               w3m-charset-to-coding-system w3m-region x-focus-frame))
-(maybe-bind '(filladapt-mode
-             mc-pgp-always-sign rmail-insert-mime-forwarded-message-function
-             url-current-object url-package-name url-package-version
+(maybe-bind '(eudc-protocol
+             filladapt-mode mc-pgp-always-sign
+             rmail-insert-mime-forwarded-message-function url-current-object
+             url-package-name url-package-version
              w3-meta-charset-content-type-regexp
              w3-meta-content-type-charset-regexp
              w3m-cid-retrieve-function-alist w3m-current-buffer
@@ -32,9 +33,9 @@
 
 (if (featurep 'xemacs)
     (progn
-      (maybe-fbind '(delete-overlay detect-coding-string
-                    event-click-count event-end event-start
-                    find-coding-systems-for-charsets
+      (maybe-fbind '(delete-overlay
+                    detect-coding-string eudc-expand-inline event-click-count
+                    event-end event-start find-coding-systems-for-charsets
                     find-coding-systems-region find-coding-systems-string
                     mail-abbrevs-setup mouse-minibuffer-check
                     mouse-movement-p mouse-scroll-subr overlay-lists

diff --git a/lisp/message.el b/lisp/message.el
index 605865a..9df4753 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -60,11 +60,11 @@
 
 (require 'rfc822)
 (eval-and-compile
-  (autoload 'customize-save-variable "cus-edit") ;; for Mule 2.
-  (autoload 'sha1 "sha1-el")
   (autoload 'gnus-find-method-for-group "gnus")
   (autoload 'nnvirtual-find-group-art "nnvirtual")
   (autoload 'gnus-group-decoded-name "gnus-group"))
+(eval-when-compile
+  (autoload 'sha1 "sha1-el"))
 
 (defgroup message '((user-mail-address custom-variable)
                    (user-full-name custom-variable))