Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75edbf7..d357a0b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-09  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-canlock-password): Set
+       canlock-password-for-verify to newly generated canlock-password.
+       When Emacs is restarted, Custom makes sure this is set, but during
+       the same session we must set it manually.
+
 2002-08-07  Jesper harder  <harder@ifa.au.dk>
 
        * yenc.el: New file.

diff --git a/lisp/message.el b/lisp/message.el
index fdfc1cb..e789a75 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3687,7 +3687,8 @@ Do not use this for anything important, it is cryptographically weak."
 This is the value of `canlock-password', if that option is non-nil.
 Otherwise, generate and save a value for `canlock-password' first."
   (unless canlock-password
-    (customize-save-variable 'canlock-password (message-canlock-generate)))
+    (customize-save-variable 'canlock-password (message-canlock-generate))
+    (setq canlock-password-for-verify canlock-password))
   canlock-password)
 
 (defun message-insert-canlock ()