Commit a048c295 authored by Katsumi Yamaoka's avatar Katsumi Yamaoka
Browse files

[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.
parent 16b0520a
2013-07-23 Katsumi Yamaoka <yamaoka@jpl.org> 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. Calculate gnus-version correctly on Cygwin.
   
* gnus.el (gnus-continuum-version): Do main calculations in integers. * gnus.el (gnus-continuum-version): Do main calculations in integers.
......
...@@ -1132,7 +1132,9 @@ See the variable `gnus-user-agent'." ...@@ -1132,7 +1132,9 @@ See the variable `gnus-user-agent'."
(gnus-v (gnus-v
(when (memq 'gnus gnus-user-agent) (when (memq 'gnus gnus-user-agent)
(concat "Gnus/" (concat "Gnus/"
(gnus-continuum-version-1 gnus-version) (gnus-replace-in-string
(format "%1.8f" (gnus-continuum-version gnus-version))
"0+\\'" "")
" (" gnus-version ")"))) " (" gnus-version ")")))
(emacs-v (gnus-emacs-version))) (emacs-v (gnus-emacs-version)))
(concat gnus-v (when (and gnus-v emacs-v) " ") (concat gnus-v (when (and gnus-v emacs-v) " ")
...@@ -1534,7 +1536,7 @@ If YANK is non-nil, include the original article." ...@@ -1534,7 +1536,7 @@ If YANK is non-nil, include the original article."
(X-Debbugs-Package (X-Debbugs-Package
. ,(format "%s" gnus-bug-package)) . ,(format "%s" gnus-bug-package))
(X-Debbugs-Version (X-Debbugs-Version
. ,(gnus-continuum-version-1))))) . ,(format "%s" (gnus-continuum-version))))))
(when gnus-bug-create-help-buffer (when gnus-bug-create-help-buffer
(push `(gnus-bug-kill-buffer) message-send-actions)) (push `(gnus-bug-kill-buffer) message-send-actions))
(goto-char (point-min)) (goto-char (point-min))
......
...@@ -3229,10 +3229,6 @@ If ARG, insert string at point." ...@@ -3229,10 +3229,6 @@ If ARG, insert string at point."
(defun gnus-continuum-version (&optional version) (defun gnus-continuum-version (&optional version)
"Return VERSION as a floating point number." "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 (unless version
(setq version gnus-version)) (setq version gnus-version))
(when (or (string-match "^\\([^ ]+\\)? ?Gnus v?\\([0-9.]+\\)$" version) (when (or (string-match "^\\([^ ]+\\)? ?Gnus v?\\([0-9.]+\\)$" version)
...@@ -3248,21 +3244,18 @@ If ARG, insert string at point." ...@@ -3248,21 +3244,18 @@ If ARG, insert string at point."
least (if (match-beginning 3) least (if (match-beginning 3)
(string-to-number (match-string 3 number)) (string-to-number (match-string 3 number))
0)) 0))
(gnus-replace-in-string (string-to-number
(if (zerop major) (if (zerop major)
(progn (format "%1.2f00%02d%02d"
(setq major (if (member alpha '("(ding)" "d"))
(if (member alpha '("(ding)" "d")) 4.99
499 (+ 5 (* 0.02
(+ 500 (* 2
(abs (abs
(- (mm-char-int (aref (downcase alpha) 0)) (- (mm-char-int (aref (downcase alpha) 0))
(mm-char-int ?t)))) (mm-char-int ?t))))
-1))) -0.01))
(format "%s.%s00%02d%02d" minor least)
(/ major 100) (% major 100) minor least)) (format "%d.%02d%02d" major minor least))))))
(format "%d.%02d%02d" major minor least))
"0+\\'" ""))))
(defun gnus-info-find-node (&optional nodename) (defun gnus-info-find-node (&optional nodename)
"Find Info documentation of Gnus." "Find Info documentation of Gnus."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment