Revision: [email protected]/emacs--cvs-trunk--0--patch-58

Merge from gnus--rel--5.10

Patches applied:

 * [email protected]/gnus--rel--5.10--patch-7
   Merge from emacs--cvs-trunk--0

 * [email protected]/gnus--rel--5.10--patch-8
 - [email protected]/gnus--rel--5.10--patch-11
   Update from CVS

2005-01-28  Katsumi Yamaoka  <[email protected]>

   * lisp/gnus/gnus-art.el (gnus-article-setup-buffer): Kill and re-create the
   article buffer when editing of the article is discarded.
   (gnus-article-prepare): Revert.

2005-01-28  Katsumi Yamaoka  <[email protected]>

   * lisp/gnus/gnus-art.el (gnus-article-prepare): Remove
   message-strip-forbidden-properties from the local hook.

2005-01-24  Katsumi Yamaoka  <[email protected]>

   * lisp/gnus/mml.el (mml-generate-mime-1): Convert string into unibyte when
   inserting " *mml*" buffer's contents into a unibyte temp buffer.

2005-01-28  Lars Magne Ingebrigtsen  <[email protected]>

   * man/gnus.texi: Some edits based on comments from David Abrahams.

2005-01-24  Katsumi Yamaoka  <[email protected]>

   * man/gnus.texi (RSS): Fix the keystroke.

3 files changed, 32 insertions, 9 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 86e279685c..2fbab6bea5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,6 +3,22 @@
 	* message.el (message-beginning-of-line): Change the behavior when
 	invoked between BOL and : so that it first moves backward.
 
+2005-01-28  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-art.el (gnus-article-setup-buffer): Kill and re-create the
+	article buffer when editing of the article is discarded.
+	(gnus-article-prepare): Revert.
+
+2005-01-28  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-art.el (gnus-article-prepare): Remove
+	message-strip-forbidden-properties from the local hook.
+
+2005-01-24  Katsumi Yamaoka  <[email protected]>
+
+	* mml.el (mml-generate-mime-1): Convert string into unibyte when
+	inserting " *mml*" buffer's contents into a unibyte temp buffer.
+
 2005-01-20  Katsumi Yamaoka  <[email protected]>
 
 	* mm-decode.el (mm-insert-part): Switch the multibyteness of data
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 7450fee69e..8a81176a5f 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1,5 +1,5 @@
 ;;; gnus-art.el --- article mode commands for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[email protected]>
@@ -3743,14 +3743,19 @@ commands:
       (mm-enable-multibyte)
       (setq major-mode 'gnus-original-article-mode)
       (make-local-variable 'gnus-original-article))
-    (if (get-buffer name)
+    (if (and (get-buffer name)
+	     (with-current-buffer name
+	       (if gnus-article-edit-mode
+		   (if (y-or-n-p "Article mode edit in progress; discard? ")
+		       (progn
+			 (set-buffer-modified-p nil)
+			 (gnus-kill-buffer name)
+			 (message "")
+			 nil)
+		     (error "Action aborted"))
+		 t)))
 	(save-excursion
 	  (set-buffer name)
-	  (when (and gnus-article-edit-mode
-		     (buffer-modified-p)
-		     (not
-		      (y-or-n-p "Article mode edit in progress; discard? ")))
-	    (error "Action aborted"))
 	  (set (make-local-variable 'gnus-article-edit-mode) nil)
 	  (when gnus-article-mime-handles
 	    (mm-destroy-parts gnus-article-mime-handles)
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 8efaede70e..f774e53499 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1,5 +1,5 @@
 ;;; mml.el --- A package for parsing and validating MML documents
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[email protected]>
@@ -472,7 +472,9 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	    (mm-with-unibyte-buffer
 	      (cond
 	       ((cdr (assq 'buffer cont))
-		(insert-buffer-substring (cdr (assq 'buffer cont))))
+		(insert (with-current-buffer (cdr (assq 'buffer cont))
+			  (mm-with-unibyte-current-buffer
+			    (buffer-string)))))
 	       ((and (setq filename (cdr (assq 'filename cont)))
 		     (not (equal (cdr (assq 'nofile cont)) "yes")))
 		(let ((coding-system-for-read mm-binary-coding-system))