projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(nnml-generate-nov-databases-directory): Document no-active
[gnus]
/
lisp
/
nndraft.el
diff --git
a/lisp/nndraft.el
b/lisp/nndraft.el
index
c956305
..
f7ab938
100644
(file)
--- a/
lisp/nndraft.el
+++ b/
lisp/nndraft.el
@@
-1,7
+1,7
@@
;;; nndraft.el --- draft article access for Gnus
;;; nndraft.el --- draft article access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 200
3
-;;
Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 200
2, 2003,
+;;
2004, 2005, 2006
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
@@
-20,8
+20,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Commentary:
@@
-174,8
+174,11
@@
(setq buffer-file-name (expand-file-name file)
buffer-auto-save-file-name (make-auto-save-file-name))
(clear-visited-file-modtime)
(setq buffer-file-name (expand-file-name file)
buffer-auto-save-file-name (make-auto-save-file-name))
(clear-visited-file-modtime)
- (make-local-variable 'write-contents-hooks)
- (push 'nndraft-generate-headers write-contents-hooks)
+ (let ((hook (if (boundp 'write-contents-functions)
+ 'write-contents-functions
+ 'write-contents-hooks)))
+ (gnus-make-local-hook hook)
+ (add-hook hook 'nndraft-generate-headers nil t))
article))
(deffoo nndraft-request-group (group &optional server dont-check)
article))
(deffoo nndraft-request-group (group &optional server dont-check)
@@
-185,7
+188,7
@@
(file-name-coding-system nnmail-pathname-coding-system)
dir file)
(nnheader-re-read-dir pathname)
(file-name-coding-system nnmail-pathname-coding-system)
dir file)
(nnheader-re-read-dir pathname)
- (setq dir (mapcar (lambda (name) (string-to-
int
(substring name 1)))
+ (setq dir (mapcar (lambda (name) (string-to-
number
(substring name 1)))
(ignore-errors (directory-files
pathname nil "^#[0-9]+#$" t))))
(dolist (n dir)
(ignore-errors (directory-files
pathname nil "^#[0-9]+#$" t))))
(dolist (n dir)
@@
-196,12
+199,22
@@
'nnmh-request-group
(list group server dont-check)))
'nnmh-request-group
(list group server dont-check)))
-(deffoo nndraft-request-move-article (article group server
-
accept-form &optional last
)
+(deffoo nndraft-request-move-article (article group server
accept-form
+
&optional last move-is-internal
)
(nndraft-possibly-change-group group)
(nndraft-possibly-change-group group)
- (let ((nnmh-allow-delete-final t))
- (nnoo-parent-function 'nndraft 'nnmh-request-move-article
- (list article group server accept-form last))))
+ (let ((buf (get-buffer-create " *nndraft move*"))
+ result)
+ (and
+ (nndraft-request-article article group server)
+ (save-excursion
+ (set-buffer buf)
+ (erase-buffer)
+ (insert-buffer-substring nntp-server-buffer)
+ (setq result (eval accept-form))
+ (kill-buffer (current-buffer))
+ result)
+ (null (nndraft-request-expire-articles (list article) group server 'force))
+ result)))
(deffoo nndraft-request-expire-articles (articles group &optional server force)
(nndraft-possibly-change-group group)
(deffoo nndraft-request-expire-articles (articles group &optional server force)
(nndraft-possibly-change-group group)
@@
-283,7
+296,7
@@
"Return the list of messages in the group."
(gnus-make-directory nndraft-current-directory)
(sort
"Return the list of messages in the group."
(gnus-make-directory nndraft-current-directory)
(sort
- (mapcar 'string-to-
int
+ (mapcar 'string-to-
number
(directory-files nndraft-current-directory nil "\\`[0-9]+\\'" t))
'<))
(directory-files nndraft-current-directory nil "\\`[0-9]+\\'" t))
'<))
@@
-297,4
+310,5
@@
(provide 'nndraft)
(provide 'nndraft)
+;;; arch-tag: 3ce26ca0-41cb-48b1-8703-4dad35e188aa
;;; nndraft.el ends here
;;; nndraft.el ends here