Calculate gnus-version correctly on Cygwin

* gnus.el (gnus-continuum-version): Do main calculations in integers.
  (gnus-continuum-version-1): New function, return a string.
* gnus-msg.el (gnus-extended-version, gnus-bug):
  Use gnus-continuum-version-1 instead of gnus-continuum-version.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4b2892ae4b09cc508bb87342ce6e4fc4c0f85b49..5ff3aa1015b1082b96492ae9cbc139b786da5945 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2013-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       Calculate gnus-version correctly on Cygwin.
+
+       * gnus.el (gnus-continuum-version): Do main calculations in integers.
+       (gnus-continuum-version-1): New function, return a string.
+
+       * gnus-msg.el (gnus-extended-version, gnus-bug):
+       Use gnus-continuum-version-1 instead of gnus-continuum-version.
+
 2013-07-19  Geoff Kuenning  <geoff@cs.hmc.edu>  (tiny change)
 
        * gnus-art.el (gnus-treat-predicate): Allow functions as predicates

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e3f18662af4d3a072310f6069a7e7704f29c6dff..761156b89c6e5d6e210e5cd688de155db87aa13f 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1132,7 +1132,7 @@ See the variable `gnus-user-agent'."
           (gnus-v
            (when (memq 'gnus gnus-user-agent)
              (concat "Gnus/"
-                     (prin1-to-string (gnus-continuum-version gnus-version) t)
+                     (gnus-continuum-version-1 gnus-version)
                      " (" gnus-version ")")))
           (emacs-v (gnus-emacs-version)))
       (concat gnus-v (when (and gnus-v emacs-v) " ")
@@ -1534,7 +1534,7 @@ If YANK is non-nil, include the original article."
                        (X-Debbugs-Package
                         . ,(format "%s" gnus-bug-package))
                        (X-Debbugs-Version
-                        . ,(format "%s" (gnus-continuum-version))))))
+                        . ,(gnus-continuum-version-1)))))
     (when gnus-bug-create-help-buffer
       (push `(gnus-bug-kill-buffer) message-send-actions))
     (goto-char (point-min))

diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 8741a03b54d8f1c16885f25fbcc6176b85dd5c2e..ca8ea8f52fa0754b91631a174c8c9e436e7b78b3 100644 (file)
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3229,6 +3229,10 @@ If ARG, insert string at point."
 
 (defun gnus-continuum-version (&optional version)
   "Return VERSION as a floating point number."
+  (string-to-number (gnus-continuum-version-1 (or version gnus-version))))
+
+(defun gnus-continuum-version-1 (&optional version)
+  "Return VERSION as a string."
   (unless version
     (setq version gnus-version))
   (when (or (string-match "^\\([^ ]+\\)? ?Gnus v?\\([0-9.]+\\)$" version)
@@ -3244,18 +3248,21 @@ If ARG, insert string at point."
            least (if (match-beginning 3)
                      (string-to-number (match-string 3 number))
                    0))
-      (string-to-number
+      (gnus-replace-in-string
        (if (zerop major)
-            (format "%s00%02d%02d"
-                    (if (member alpha '("(ding)" "d"))
-                        "4.99"
-                      (+ 5 (* 0.02
+          (progn
+            (setq major
+                  (if (member alpha '("(ding)" "d"))
+                      499
+                    (+ 500 (* 2
                               (abs
                                (- (mm-char-int (aref (downcase alpha) 0))
                                   (mm-char-int ?t))))
-                         -0.01))
-                    minor least)
-        (format "%d.%02d%02d" major minor least))))))
+                       -1)))
+            (format "%s.%s00%02d%02d"
+                    (/ major 100) (% major 100) minor least))
+        (format "%d.%02d%02d" major minor least))
+       "0+\\'" ""))))
 
 (defun gnus-info-find-node (&optional nodename)
   "Find Info documentation of Gnus."