[gnus git] branch master updated: m0-5-124-gcc50e3e =4= * nnmaildir.el (nnmaildir--article-set-flags): Fix compilation error. ; Fix nnimap charset issues when doing internal moves ; (gnus-demon-init): Fixed regression when IDLE is t and TIME is set. ; (gnus-read-ephemeral-bug-group): Allow opening more than one group at a time
Lars Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via cc50e3e15d7a8c8fe77ce93c370fb8e6b90e8de5 (commit)
via 5df3ceb6fd2bcb5d9a2390701eb494a2d5630a99 (commit)
via dccfa5eb7762d8d559e2aa572ec2412a9f1c089c (commit)
via 32d43bf05f4e3f6f4cad038f7fa04ddf88596e84 (commit)
from a1e811e8e34628b751ddc7dccb7b8e7c95afb7ee (commit)
- Log -----------------------------------------------------------------
commit cc50e3e15d7a8c8fe77ce93c370fb8e6b90e8de5
Author: Magnus Henoch <[email protected]>
Date: Thu Sep 6 00:30:10 2012 +0200
* nnmaildir.el (nnmaildir--article-set-flags): Fix compilation error.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c568d79..32eebba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-05 Magnus Henoch <[email protected]>
+
+ * nnmaildir.el (nnmaildir--article-set-flags): Fix compilation error.
+
2012-09-05 Martin Stjernholm <[email protected]>
* nnimap.el (nnimap-request-move-article): Decode the group name when
diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index caf2820..327649d 100644
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -127,16 +127,6 @@ SUFFIX should start with \":2,\"."
(new-flags (concat (delq flag flags-as-list))))
(concat ":2," new-flags)))
-(defun nnmaildir--article-set-flags (article new-suffix curdir)
- (let* ((prefix (nnmaildir--art-prefix article))
- (suffix (nnmaildir--art-suffix article))
- (article-file (concat curdir prefix suffix))
- (new-name (concat curdir prefix new-suffix)))
- (unless (file-exists-p article-file)
- (error "Couldn't find article file %s" article-file))
- (rename-file article-file new-name 'replace)
- (setf (nnmaildir--art-suffix article) new-suffix)))
-
(defvar nnmaildir-article-file-name nil
"*The filename of the most recently requested article. This variable is set
by nnmaildir-request-article.")
@@ -212,6 +202,16 @@ by nnmaildir-request-article.")
(gnm nil) ;; flag: split from mail-sources?
(target-prefix nil :type string)) ;; symlink target prefix
+(defun nnmaildir--article-set-flags (article new-suffix curdir)
+ (let* ((prefix (nnmaildir--art-prefix article))
+ (suffix (nnmaildir--art-suffix article))
+ (article-file (concat curdir prefix suffix))
+ (new-name (concat curdir prefix new-suffix)))
+ (unless (file-exists-p article-file)
+ (error "Couldn't find article file %s" article-file))
+ (rename-file article-file new-name 'replace)
+ (setf (nnmaildir--art-suffix article) new-suffix)))
+
(defun nnmaildir--expired-article (group article)
(setf (nnmaildir--art-nov article) nil)
(let ((flist (nnmaildir--grp-flist group))
commit 5df3ceb6fd2bcb5d9a2390701eb494a2d5630a99
Author: Martin Stjernholm <[email protected]>
Date: Wed Sep 5 21:58:36 2012 +0200
Fix nnimap charset issues when doing internal moves
* nnimap.el (nnimap-request-move-article): Decode the group name when
doing internal moves to avoid charset issues.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a123ed9..c568d79 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2012-09-05 Martin Stjernholm <[email protected]>
+ * nnimap.el (nnimap-request-move-article): Decode the group name when
+ doing internal moves to avoid charset issues.
+
* gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and
TIME is set.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 9f638a7..3277a7f 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -857,6 +857,8 @@ textual parts.")
(deffoo nnimap-request-move-article (article group server accept-form
&optional last internal-move-group)
(setq group (nnimap-decode-gnus-group group))
+ (when internal-move-group
+ (setq internal-move-group (nnimap-decode-gnus-group internal-move-group)))
(with-temp-buffer
(mm-disable-multibyte)
(when (funcall (if internal-move-group
commit dccfa5eb7762d8d559e2aa572ec2412a9f1c089c
Author: Martin Stjernholm <[email protected]>
Date: Wed Sep 5 21:54:34 2012 +0200
(gnus-demon-init): Fixed regression when IDLE is t and TIME is set.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b2be2f..a123ed9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-05 Martin Stjernholm <[email protected]>
+
+ * gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and
+ TIME is set.
+
2012-09-05 Juri Linkov <[email protected]>
* gnus-group.el (gnus-read-ephemeral-bug-group): Allow opening more
diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index 115c577..671c566 100644
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -144,9 +144,12 @@ marked with SPECIAL."
(* (gnus-demon-time-to-step time) gnus-demon-timestep))
(t
(* time gnus-demon-timestep))))
- (idle (if (numberp idle)
- (* idle gnus-demon-timestep)
- idle))
+ (idle (cond ((numberp idle)
+ (* idle gnus-demon-timestep))
+ ((and (eq idle t) (numberp time))
+ time)
+ (t
+ idle)))
(timer
(cond
commit 32d43bf05f4e3f6f4cad038f7fa04ddf88596e84
Author: Juri Linkov <[email protected]>
Date: Wed Sep 5 21:36:05 2012 +0200
(gnus-read-ephemeral-bug-group): Allow opening more than one group at a time
(bug#11961).
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4783a1..9b2be2f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-05 Juri Linkov <[email protected]>
+
+ * gnus-group.el (gnus-read-ephemeral-bug-group): Allow opening more
+ than one group at a time (bug#11961).
+
2012-09-05 Julien Danjou <[email protected]>
* gnus-srvr.el (gnus-server-open-server): Don't message on failure:
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 550447c..dcccdd8 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2481,7 +2481,8 @@ the bug number, and browsing the URL must return mbox output."
"/.*$" ""))))
(write-region (point-min) (point-max) tmpfile)
(gnus-group-read-ephemeral-group
- "gnus-read-ephemeral-bug"
+ (format "gnus-read-ephemeral-bug:%s"
+ (mapconcat 'number-to-string ids ","))
`(nndoc ,tmpfile
(nndoc-article-type mbox))
nil window-conf))
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 17 +++++++++++++++++
lisp/gnus-demon.el | 9 ++++++---
lisp/gnus-group.el | 3 ++-
lisp/nnimap.el | 2 ++
lisp/nnmaildir.el | 20 ++++++++++----------
5 files changed, 37 insertions(+), 14 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project