diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-05-13 05:59:23 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-05-13 05:59:23 +0000 |
| commit | 7cab80f97c7bfb793e255f0d31f8fc346e8708a8 (patch) | |
| tree | 2bd6359d61581eb6b9b2f523a64198156049452d /lisp/gnus/mml1991.el | |
| parent | c0a2b70a9cf31bea474b259ce305d183b90a8a1a (diff) | |
| download | emacs-7cab80f97c7bfb793e255f0d31f8fc346e8708a8.tar.gz | |
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.
Diffstat (limited to 'lisp/gnus/mml1991.el')
| -rw-r--r-- | lisp/gnus/mml1991.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index a3ada29fa66..3ba479574fd 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -145,6 +145,7 @@ Whether the passphrase is cached at all is controlled by (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 @@ Whether the passphrase is cached at all is controlled by (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) |