# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1273730410 0
# Node ID 94953ca592e83f1461c676573e49a4b08d19ce2d
# Parent  6fafd89a8318daabfef5b456427ace45fa684856# Parent  de6d3e5f8e8ebcd79e41fffbe6d2b9b06be1b8fc
Synch with Gnus trunk.
* gnus-art.el (gnus-bind-safe-url-regexp): Bind mm-w3m-safe-url-regexp
 to nil when we're in a mml-preview buffer and no group is selected.

* mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt)
* mml2015.el (mml2015-gpg-encrypt): Disable multibyte in buffers
 generated within the mm-with-unibyte-current-buffer macro.

diff -r 6fafd89a8318 -r 94953ca592e8 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed May 12 21:23:06 2010 -0700
+++ b/lisp/gnus/ChangeLog	Thu May 13 06:00:10 2010 +0000
@@ -1,3 +1,14 @@
+2010-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt)
+	* mml2015.el (mml2015-gpg-encrypt): Disable multibyte in buffers
+	generated within the mm-with-unibyte-current-buffer macro.
+
+2010-05-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-bind-safe-url-regexp): Bind mm-w3m-safe-url-regexp
+	to nil when we're in a mml-preview buffer and no group is selected.
+
 2010-05-12  Andreas Seltenreich  <seltenreich@gmx.de>
 
 	* gnus-sum.el (gnus-summary-read-group-1): Don't jump to next group
diff -r 6fafd89a8318 -r 94953ca592e8 lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Wed May 12 21:23:06 2010 -0700
+++ b/lisp/gnus/gnus-art.el	Thu May 13 06:00:10 2010 +0000
@@ -4822,7 +4822,11 @@
 			   (with-current-buffer gnus-article-current-summary
 			     gnus-newsgroup-name)
 			 gnus-newsgroup-name)))
-	    (if (cond ((stringp gnus-safe-html-newsgroups)
+	    (if (cond ((not group)
+		       ;; Maybe we're in a mml-preview buffer
+		       ;; and no group is selected.
+		       t)
+		      ((stringp gnus-safe-html-newsgroups)
 		       (string-match gnus-safe-html-newsgroups group))
 		      ((consp gnus-safe-html-newsgroups)
 		       (member group gnus-safe-html-newsgroups)))
diff -r 6fafd89a8318 -r 94953ca592e8 lisp/gnus/mml1991.el
--- a/lisp/gnus/mml1991.el	Wed May 12 21:23:06 2010 -0700
+++ b/lisp/gnus/mml1991.el	Thu May 13 06:00:10 2010 +0000
@@ -145,6 +145,7 @@
       (delete-region (point-min) (point)))
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+	(inline (mm-disable-multibyte))
 	(setq cipher (current-buffer))
 	(insert-buffer-substring text)
 	(unless (mc-encrypt-generic
@@ -225,6 +226,7 @@
       (delete-region (point-min) (point)))
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+	(inline (mm-disable-multibyte))
 	(flet ((gpg-encrypt-func
 		(sign plaintext ciphertext result recipients &optional
 		      passphrase sign-with-key armor textmode)
diff -r 6fafd89a8318 -r 94953ca592e8 lisp/gnus/mml2015.el
--- a/lisp/gnus/mml2015.el	Wed May 12 21:23:06 2010 -0700
+++ b/lisp/gnus/mml2015.el	Thu May 13 06:00:10 2010 +0000
@@ -680,6 +680,7 @@
 	cipher)
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+	(mm-disable-multibyte)
 	;; set up a function to call the correct gpg encrypt routine
 	;; with the right arguments. (FIXME: this should be done
 	;; differently.)