[Gnus] Fix previous commit

* gnus.el (gnus-continuum-version):
* gnus-msg.el (gnus-extended-version): Simplify.

* gnus.el (gnus-continuum-version-1): Remove.
* gnus-msg.el (gnus-bug): Revert.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5ff3aa1015b1082b96492ae9cbc139b786da5945..5d3de61aa916d0be63646e54012c7fafc71641c8 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,11 @@
 2013-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * gnus.el (gnus-continuum-version):
+       * gnus-msg.el (gnus-extended-version): Simplify.
+
+       * gnus.el (gnus-continuum-version-1): Remove.
+       * gnus-msg.el (gnus-bug): Revert.
+
        Calculate gnus-version correctly on Cygwin.
 
        * gnus.el (gnus-continuum-version): Do main calculations in integers.

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 761156b89c6e5d6e210e5cd688de155db87aa13f..0f78f2edc5f6477e98569d0b83272ca3c3bfd9ce 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1132,7 +1132,9 @@ See the variable `gnus-user-agent'."
           (gnus-v
            (when (memq 'gnus gnus-user-agent)
              (concat "Gnus/"
-                     (gnus-continuum-version-1 gnus-version)
+                     (gnus-replace-in-string
+                      (format "%1.8f" (gnus-continuum-version gnus-version))
+                      "0+\\'" "")
                      " (" gnus-version ")")))
           (emacs-v (gnus-emacs-version)))
       (concat gnus-v (when (and gnus-v emacs-v) " ")
@@ -1534,7 +1536,7 @@ If YANK is non-nil, include the original article."
                        (X-Debbugs-Package
                         . ,(format "%s" gnus-bug-package))
                        (X-Debbugs-Version
-                        . ,(gnus-continuum-version-1)))))
+                        . ,(format "%s" (gnus-continuum-version))))))
     (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 ca8ea8f52fa0754b91631a174c8c9e436e7b78b3..409b1cc62552781e00579ad87c132f533ca74bd9 100644 (file)
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3229,10 +3229,6 @@ 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)
@@ -3248,21 +3244,18 @@ If ARG, insert string at point."
            least (if (match-beginning 3)
                      (string-to-number (match-string 3 number))
                    0))
-      (gnus-replace-in-string
+      (string-to-number
        (if (zerop major)
-          (progn
-            (setq major
-                  (if (member alpha '("(ding)" "d"))
-                      499
-                    (+ 500 (* 2
+            (format "%1.2f00%02d%02d"
+                    (if (member alpha '("(ding)" "d"))
+                        4.99
+                      (+ 5 (* 0.02
                               (abs
                                (- (mm-char-int (aref (downcase alpha) 0))
                                   (mm-char-int ?t))))
-                       -1)))
-            (format "%s.%s00%02d%02d"
-                    (/ major 100) (% major 100) minor least))
-        (format "%d.%02d%02d" major minor least))
-       "0+\\'" ""))))
+                         -0.01))
+                    minor least)
+        (format "%d.%02d%02d" major minor least))))))
 
 (defun gnus-info-find-node (&optional nodename)
   "Find Info documentation of Gnus."