Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-276

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d4b770287e3..23379fa6ce1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-disassociate-draft): Revert 2008-03-18 change.
+
 2008-05-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-button-alist): Exclude newline in RFC2396-compliant
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index fa25bb1f20b..214d971a9bc 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5827,7 +5827,7 @@ are not included."
   "Disassociate the message buffer from the drafts directory."
   (when message-draft-article
     (nndraft-request-expire-articles
-     (list message-draft-article) "nndraft:drafts" nil t)))
+     (list message-draft-article) "drafts" nil t)))
 
 (defun message-insert-headers ()
   "Generate the headers for the article."