# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1106428023 0
# Node ID 0017dfb224eff38eeb09e7cd7cfe45679a77ffdf
# Parent  007a1a6d92dee7979e3c7b1e4b285b3a1ab3453f
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-47

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-4
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-5
   Update from CVS: exi/gnus-faq.texi ([4.1]): Typo.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-6
   Update from CVS

2005-01-20  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mm-decode.el (mm-insert-part): Switch the multibyteness of data
   which will be inserted according to the multibyteness of a buffer
   rather than the type of contents.  Suggested by ARISAWA Akihiro
   <ari@mbf.ocn.ne.jp>.

2005-01-16  Xavier Maillard <zedek@gnu-rox.org> (tiny change)

   * man/gnus-faq.texi ([4.1]): Typo.

diff -r 007a1a6d92de -r 0017dfb224ef lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Jan 22 15:54:04 2005 +0000
+++ b/lisp/gnus/ChangeLog	Sat Jan 22 21:07:03 2005 +0000
@@ -1,3 +1,10 @@
+2005-01-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-decode.el (mm-insert-part): Switch the multibyteness of data
+	which will be inserted according to the multibyteness of a buffer
+	rather than the type of contents.  Suggested by ARISAWA Akihiro
+	<ari@mbf.ocn.ne.jp>.
+
 2005-01-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* spam.el (spam-face): New face.  Don't use `gnus-splash-face'
diff -r 007a1a6d92de -r 0017dfb224ef lisp/gnus/mm-decode.el
--- a/lisp/gnus/mm-decode.el	Sat Jan 22 15:54:04 2005 +0000
+++ b/lisp/gnus/mm-decode.el	Sat Jan 22 21:07:03 2005 +0000
@@ -1,5 +1,5 @@
 ;;; mm-decode.el --- Functions for decoding MIME things
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -1032,27 +1032,10 @@
 
 (defun mm-insert-part (handle)
   "Insert the contents of HANDLE in the current buffer."
-  (let ((cur (current-buffer)))
-    (save-excursion
-      (if (member (mm-handle-media-supertype handle) '("text" "message"))
-	  (with-temp-buffer
-	    (insert-buffer-substring (mm-handle-buffer handle))
-	    (prog1
-		(mm-decode-content-transfer-encoding
-		 (mm-handle-encoding handle)
-		 (mm-handle-media-type handle))
-	      (let ((temp (current-buffer)))
-		(set-buffer cur)
-		(insert-buffer-substring temp))))
-	(mm-with-unibyte-buffer
-	  (insert-buffer-substring (mm-handle-buffer handle))
-	  (prog1
-	      (mm-decode-content-transfer-encoding
-	       (mm-handle-encoding handle)
-	       (mm-handle-media-type handle))
-	    (let ((temp (current-buffer)))
-	      (set-buffer cur)
-	      (insert-buffer-substring temp))))))))
+  (save-excursion
+    (insert (if (mm-multibyte-p)
+		(mm-string-as-multibyte (mm-get-part handle))
+	      (mm-get-part handle)))))
 
 (defun mm-file-name-delete-whitespace (file-name)
   "Remove all whitespace characters from FILE-NAME."
diff -r 007a1a6d92de -r 0017dfb224ef man/ChangeLog
--- a/man/ChangeLog	Sat Jan 22 15:54:04 2005 +0000
+++ b/man/ChangeLog	Sat Jan 22 21:07:03 2005 +0000
@@ -1,3 +1,7 @@
+2005-01-16  Xavier Maillard <zedek@gnu-rox.org> (tiny change)
+
+	* gnus-faq.texi ([4.1]): Typo.
+
 2005-01-22  David Kastrup  <dak@gnu.org>
 
 	* building.texi (Grep Searching): Mention alias `find-grep' for
diff -r 007a1a6d92de -r 0017dfb224ef man/gnus-faq.texi
--- a/man/gnus-faq.texi	Sat Jan 22 15:54:04 2005 +0000
+++ b/man/gnus-faq.texi	Sat Jan 22 21:07:03 2005 +0000
@@ -1,6 +1,6 @@
 @c Insert  "\input texinfo" at 1st line before texing this file alone.
 @c -*-texinfo-*-
-@c Copyright (C) 1995, 2001, 2003, 2004 Free Software Foundation, Inc.
+@c Copyright (C) 1995, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 @setfilename gnus-faq.info
 
 @c Frequently Asked Questions, FAQ - Introduction, Emacs for Heathens, Top
@@ -857,7 +857,7 @@
 
  If you enter the group by saying 
  @samp{RET}
- in summary buffer with point over the group, only unread and ticked messages are loaded. Say
+ in group buffer with point over the group, only unread and ticked messages are loaded. Say
  @samp{C-u RET}
  instead to load all available messages. If you want only the e.g. 300 newest say
  @samp{C-u 300 RET}