aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGnus developers2011-02-13 23:30:55 +0000
committerKatsumi Yamaoka2011-02-13 23:30:55 +0000
commit12295c5dee18f2098a3b4fe24399e016ef5d9e49 (patch)
tree6b683ed61a03a60aa8e31349164e02b961400b9f
parentabfc152b45e356fc73c798ed770765c7d2560075 (diff)
downloademacs-12295c5dee18f2098a3b4fe24399e016ef5d9e49.tar.gz
emacs-12295c5dee18f2098a3b4fe24399e016ef5d9e49.zip
gnus-delay.el (gnus-delay-article) Fix number of seconds per day. Improve prompt.
gnus-art.el (gnus-article-mode-line-format): Remove the article washing status from the default format. It isn't very informative.
-rw-r--r--lisp/gnus/ChangeLog10
-rw-r--r--lisp/gnus/gnus-art.el3
-rw-r--r--lisp/gnus/gnus-delay.el4
3 files changed, 14 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9c1de7da577..1760b0f22fe 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
12011-02-13 Adam Sjøgren <asjo@koldfront.dk>
2
3 * gnus-delay.el (gnus-delay-article) Fix number of seconds per day.
4 Improve prompt.
5
62011-02-13 Lars Ingebrigtsen <larsi@gnus.org>
7
8 * gnus-art.el (gnus-article-mode-line-format): Remove the article
9 washing status from the default format. It isn't very informative.
10
12011-02-13 Tassilo Horn <tassilo@member.fsf.org> (tiny change) 112011-02-13 Tassilo Horn <tassilo@member.fsf.org> (tiny change)
2 12
3 * nnimap.el (nnimap-request-accept-article, nnimap-process-quirk): Fix 13 * nnimap.el (nnimap-request-accept-article, nnimap-process-quirk): Fix
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 54797b2a518..d7c0d7a7250 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -683,7 +683,7 @@ beginning of a line."
683 :type 'regexp 683 :type 'regexp
684 :group 'gnus-article-various) 684 :group 'gnus-article-various)
685 685
686(defcustom gnus-article-mode-line-format "Gnus: %g [%w] %S%m" 686(defcustom gnus-article-mode-line-format "Gnus: %g %S%m"
687 "*The format specification for the article mode line. 687 "*The format specification for the article mode line.
688See `gnus-summary-mode-line-format' for a closer description. 688See `gnus-summary-mode-line-format' for a closer description.
689 689
@@ -691,6 +691,7 @@ The following additional specs are available:
691 691
692%w The article washing status. 692%w The article washing status.
693%m The number of MIME parts in the article." 693%m The number of MIME parts in the article."
694 :version "24.1"
694 :type 'string 695 :type 'string
695 :group 'gnus-article-various) 696 :group 'gnus-article-various)
696 697
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index a06a510ecdd..bfd17055ea5 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -78,7 +78,7 @@ DELAY is a string, giving the length of the time. Possible values are:
78 time, then the deadline is tomorrow, else today." 78 time, then the deadline is tomorrow, else today."
79 (interactive 79 (interactive
80 (list (read-string 80 (list (read-string
81 "Target date (YYYY-MM-DD) or length of delay (units in [mhdwMY]): " 81 "Target date (YYYY-MM-DD), time (hh:mm), or length of delay (units in [mhdwMY]): "
82 gnus-delay-default-delay))) 82 gnus-delay-default-delay)))
83 (let (num unit days year month day hour minute deadline) 83 (let (num unit days year month day hour minute deadline)
84 (cond ((string-match 84 (cond ((string-match
@@ -105,7 +105,7 @@ DELAY is a string, giving the length of the time. Possible values are:
105 (append deadline nil)))) 105 (append deadline nil))))
106 ;; If this time has passed already, add a day. 106 ;; If this time has passed already, add a day.
107 (when (< deadline (gnus-float-time)) 107 (when (< deadline (gnus-float-time))
108 (setq deadline (+ 3600 deadline))) ;3600 secs/day 108 (setq deadline (+ 86400 deadline))) ; 86400 secs/day
109 ;; Convert seconds to date header. 109 ;; Convert seconds to date header.
110 (setq deadline (message-make-date 110 (setq deadline (message-make-date
111 (seconds-to-time deadline)))) 111 (seconds-to-time deadline))))