Synch to Gnus 200312150036.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8b0baf..bc36ce0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-15  Simon Josefsson  <jas@extundo.com>
+
+       * nndraft.el (nndraft-request-move-article): Copy definition of
+       nnmh-request-move-article instead of calling it, because the nnmh
+       version uses nnmh-request-article which isn't the same as the
+       nndraft version.
+
 2003-12-13  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el: added some gnus-registry autoloads

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 8e1be61..0f978cb 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -199,9 +199,19 @@
 (deffoo nndraft-request-move-article (article group server
                                              accept-form &optional last)
   (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)