Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1212

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1bc00d6b667021d6cd2f112b5dbc094c6327e4be..e16b8613f1e94d5ce39402dc80a66de3b0266fbb 100644 (file)
--- 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-06-03  Glenn Morris  <rgm@gnu.org>
 
        * pop3.el (nnheader-accept-process-output): Autoload it.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index b790ac433c9b800eb09e23c0bcc5ce0ed0a881f6..a1782a86ea8c8db64c9580c0534f173a10300c95 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6302,7 +6302,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."