From: yamaoka <yamaoka>
Date: Mon, 5 Sep 2005 07:36:57 +0000 (+0000)
Subject: Synch to No Gnus 200509050736.
X-Git-Tag: t-gnus-6_17_4-quimby-~395
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0709f0b2005471a5e00dd4f3354447fefcacc0b;p=elisp%2Fgnus.git-

Synch to No Gnus 200509050736.
---

diff --git a/GNUS-NEWS b/GNUS-NEWS
index a0dcfb8..9faed69 100644
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -41,7 +41,8 @@ format=flowed messages.  Also, flowed text is disabled when sending
 inline PGP signed messages.
 
 ** You can now drag and drop attachments to the Message buffer.  See
-`mml-dnd-protocol-alist' and `mml-dnd-attach-options' *Note MIME::.
+`mml-dnd-protocol-alist' and `mml-dnd-attach-options' *Note MIME:
+(message)MIME.
 
 ** The option `message-yank-empty-prefix' now controls how empty lines
 are prefixed in cited text.  *Note (message)Insertion Variables::.
@@ -53,7 +54,7 @@ articles (`gnus-article-treat-ansi-sequences').
 
 ** International host names (IDNA) can now be decoded inside article
 bodies using `W i' (`gnus-summary-idna-message').  This require that
-GNU Libidn (<http://www.gnu.org/software/libidn/>) has been installed.
+GNU Libidn (`http://www.gnu.org/software/libidn/') has been installed.
 
 ** Gnus includes an Emacs Lisp SASL library.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 617fe71..3042d5c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2005-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* mml.el (mml-mode): Silence the byte compiler.
+
 	* gnus-art.el (gnus-article-jump-to-part): Redisplay the article
 	using `(sit-for 0)' before moving the point to the specified part;
 	skip unbuttonized parts.
diff --git a/lisp/mml.el b/lisp/mml.el
index 116a2ae..7c53260 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -940,7 +940,8 @@ See Info node `(emacs-mime)Composing'.
     (easy-menu-add mml-menu mml-mode-map)
     (when (boundp 'dnd-protocol-alist)
       (set (make-local-variable 'dnd-protocol-alist)
-	   (append mml-dnd-protocol-alist dnd-protocol-alist)))
+	   (append mml-dnd-protocol-alist
+		   (symbol-value 'dnd-protocol-alist))))
     (run-hooks 'mml-mode-hook)))
 
 ;;;
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 1c347d8..4ca2bd8 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-news.texi: Fix reference.
+
 2005-09-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* message.texi (MIME): Describe mml-dnd-protocol-alist and
diff --git a/texi/gnus-news.texi b/texi/gnus-news.texi
index fb8af6f..7d49e69 100644
--- a/texi/gnus-news.texi
+++ b/texi/gnus-news.texi
@@ -54,7 +54,7 @@ inline @acronym{PGP} signed messages.
 
 @item You can now drag and drop attachments to the Message buffer.
 See @code{mml-dnd-protocol-alist} and @code{mml-dnd-attach-options}
-@xref{MIME}.
+@xref{MIME, ,MIME, message, Message Manual}.
 
 @item The option @code{message-yank-empty-prefix} now controls how
 empty lines are prefixed in cited text.