projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG is not fully...
[gnus]
/
lisp
/
nndraft.el
diff --git
a/lisp/nndraft.el
b/lisp/nndraft.el
index
dd2b8a6
..
0063488
100644
(file)
--- a/
lisp/nndraft.el
+++ b/
lisp/nndraft.el
@@
-1,7
+1,6
@@
;;; nndraft.el --- draft article access for Gnus
;;; nndraft.el --- draft article access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
@@
-77,10
+76,9
@@
are generated if and only if they are also in `message-draft-headers'.")
(deffoo nndraft-retrieve-headers (articles &optional group server fetch-old)
(nndraft-possibly-change-group group)
(deffoo nndraft-retrieve-headers (articles &optional group server fetch-old)
(nndraft-possibly-change-group group)
- (save-excursion
- (set-buffer nntp-server-buffer)
+ (with-current-buffer nntp-server-buffer
(erase-buffer)
(erase-buffer)
- (let
* (article
)
+ (let
(article lines chars
)
;; We don't support fetching by Message-ID.
(if (stringp (car articles))
'headers
;; We don't support fetching by Message-ID.
(if (stringp (car articles))
'headers
@@
-92,9
+90,12
@@
are generated if and only if they are also in `message-draft-headers'.")
(if (search-forward "\n\n" nil t)
(forward-line -1)
(goto-char (point-max)))
(if (search-forward "\n\n" nil t)
(forward-line -1)
(goto-char (point-max)))
+ (setq lines (count-lines (point) (point-max))
+ chars (- (point-max) (point)))
(delete-region (point) (point-max))
(goto-char (point-min))
(insert (format "221 %d Article retrieved.\n" article))
(delete-region (point) (point-max))
(goto-char (point-min))
(insert (format "221 %d Article retrieved.\n" article))
+ (insert (format "Lines: %d\nChars: %d\n" lines chars))
(widen)
(goto-char (point-max))
(insert ".\n")))
(widen)
(goto-char (point-max))
(insert ".\n")))
@@
-119,8
+120,7
@@
are generated if and only if they are also in `message-draft-headers'.")
mm-text-coding-system)
mm-auto-save-coding-system)))
(nnmail-find-file newest)))
mm-text-coding-system)
mm-auto-save-coding-system)))
(nnmail-find-file newest)))
- (save-excursion
- (set-buffer nntp-server-buffer)
+ (with-current-buffer nntp-server-buffer
(goto-char (point-min))
;; If there's a mail header separator in this file,
;; we remove it.
(goto-char (point-min))
;; If there's a mail header separator in this file,
;; we remove it.
@@
-184,7
+184,7
@@
are generated if and only if they are also in `message-draft-headers'.")
(add-hook hook 'nndraft-generate-headers nil t))
article))
(add-hook hook 'nndraft-generate-headers nil t))
article))
-(deffoo nndraft-request-group (group &optional server dont-check)
+(deffoo nndraft-request-group (group &optional server dont-check
info
)
(nndraft-possibly-change-group group)
(unless dont-check
(let* ((pathname (nnmail-group-pathname group nndraft-directory))
(nndraft-possibly-change-group group)
(unless dont-check
(let* ((pathname (nnmail-group-pathname group nndraft-directory))
@@
-209,8
+209,7
@@
are generated if and only if they are also in `message-draft-headers'.")
result)
(and
(nndraft-request-article article group server)
result)
(and
(nndraft-request-article article group server)
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(erase-buffer)
(insert-buffer-substring nntp-server-buffer)
(setq result (eval accept-form))
(erase-buffer)
(insert-buffer-substring nntp-server-buffer)
(setq result (eval accept-form))
@@
-222,6
+221,11
@@
are generated if and only if they are also in `message-draft-headers'.")
(deffoo nndraft-request-expire-articles (articles group &optional server force)
(nndraft-possibly-change-group group)
(let* ((nnmh-allow-delete-final t)
(deffoo nndraft-request-expire-articles (articles group &optional server force)
(nndraft-possibly-change-group group)
(let* ((nnmh-allow-delete-final t)
+ (nnmail-expiry-target
+ (or (gnus-group-find-parameter
+ (gnus-group-prefixed-name group (list 'nndraft server))
+ 'expiry-target t)
+ nnmail-expiry-target))
(res (nnoo-parent-function 'nndraft
'nnmh-request-expire-articles
(list articles group server force)))
(res (nnoo-parent-function 'nndraft
'nnmh-request-expire-articles
(list articles group server force)))