Synch to No Gnus 200603141415.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c948f35..19b9217 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-14  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-unique-id): Don't use message-number-base36
+       if (user-uid) is a float.  Reported by Bjorn Solberg
+       <bjorn_ding1@hekneby.org>.
+
 2006-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-uu.el (mm-uu-dissect): Dissect all parts correctly.

diff --git a/lisp/message.el b/lisp/message.el
index f375f34..1b02cf0 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5348,7 +5348,9 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
           (* 25 25)))
   (let ((tm (current-time)))
     (concat
-     (if (memq system-type '(ms-dos emx vax-vms))
+     (if (or (memq system-type '(ms-dos emx vax-vms))
+            ;; message-number-base36 doesn't handle bigints.
+            (float (user-uid)))
         (let ((user (downcase (user-login-name))))
           (while (string-match "[^a-z0-9_]" user)
             (aset user (match-beginning 0) ?_))