summaryrefslogtreecommitdiff
path: root/lisp/gnus/nnmaildir.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2012-09-05 22:45:43 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-09-05 22:45:43 +0000
commit067b39d4296765e83f9530eca456168f6cda95fc (patch)
tree75523b9d24b8524d034bd47cad5a7e538ba3fbbe /lisp/gnus/nnmaildir.el
parent350a188850c4eeceab0220ba1f6fdf98f0f57e93 (diff)
downloademacs-067b39d4296765e83f9530eca456168f6cda95fc.tar.gz
Merge changes made in Gnus master
2012-09-05 Magnus Henoch <magnus.henoch@gmail.com> * nnmaildir.el (nnmaildir--article-set-flags): Fix compilation error. 2012-09-05 Martin Stjernholm <mast@lysator.liu.se> * gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and TIME is set. 2012-09-05 Juri Linkov <juri@jurta.org> * gnus-group.el (gnus-read-ephemeral-bug-group): Allow opening more than one group at a time (bug#11961).
Diffstat (limited to 'lisp/gnus/nnmaildir.el')
-rw-r--r--lisp/gnus/nnmaildir.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index caf28202f04..327649d41a1 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/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))