[Emacs-diffs] trunk r113499: Calculate gnus-version correctly on Cygwin

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113499
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-23 05:22:20 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-msg.el          gnusmsg.el-20091113204419-o5vbwnq5f7feedwu-1127
  lisp/gnus/gnus.el              gnus.el-20091113204419-o5vbwnq5f7feedwu-1144

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-07-19 14:50:21 +0000
+++ b/lisp/gnus/ChangeLog       2013-07-23 05:22:20 +0000
@@ -1,3 +1,13 @@
+2013-07-23  Katsumi Yamaoka  <address@hidden>
+
+       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  <address@hidden>  (tiny change)
 
        * gnus-art.el (gnus-treat-predicate): Allow functions as predicates

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2013-07-06 23:40:56 +0000
+++ b/lisp/gnus/gnus-msg.el     2013-07-23 05:22:20 +0000
@@ -1132,7 +1132,7 @@
           (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 @@
                        (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))

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2013-07-10 22:16:03 +0000
+++ b/lisp/gnus/gnus.el 2013-07-23 05:22:20 +0000
@@ -3229,6 +3229,10 @@
 
 (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 @@
            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."