[Emacs-diffs] /srv/bzr/emacs/trunk r100255: Synch with Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 100255 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-13 06:00:10 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el
  lisp/gnus/mml1991.el
  lisp/gnus/mml2015.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-05-12 14:09:25 +0000
+++ b/lisp/gnus/ChangeLog       2010-05-13 05:59:23 +0000
@@ -1,3 +1,14 @@
+2010-05-13  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-sum.el (gnus-summary-read-group-1): Don't jump to next group

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2010-05-07 07:28:15 +0000
+++ b/lisp/gnus/gnus-art.el     2010-05-13 05:59:23 +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)))

=== modified file 'lisp/gnus/mml1991.el'
--- a/lisp/gnus/mml1991.el      2010-03-19 02:55:37 +0000
+++ b/lisp/gnus/mml1991.el      2010-05-13 05:59:23 +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)

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2010-05-07 08:10:28 +0000
+++ b/lisp/gnus/mml2015.el      2010-05-13 05:59:23 +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.)