[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113502: [Gnus] Fix previous commit
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] trunk r113502: [Gnus] Fix previous commit |
Date: |
Tue, 23 Jul 2013 07:04:49 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113502
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-23 07:04:24 +0000
message:
[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.
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-23 05:22:20 +0000
+++ b/lisp/gnus/ChangeLog 2013-07-23 07:04:24 +0000
@@ -1,5 +1,11 @@
2013-07-23 Katsumi Yamaoka <address@hidden>
+ * 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.
=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el 2013-07-23 05:22:20 +0000
+++ b/lisp/gnus/gnus-msg.el 2013-07-23 07:04:24 +0000
@@ -1132,7 +1132,9 @@
(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 @@
(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))
=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2013-07-23 05:22:20 +0000
+++ b/lisp/gnus/gnus.el 2013-07-23 07:04:24 +0000
@@ -3229,10 +3229,6 @@
(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 @@
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."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113502: [Gnus] Fix previous commit,
Katsumi Yamaoka <=