andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Synch with Gnus trunk.

Browse source 
* 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.
This commit is contained in:
Katsumi Yamaoka 2010-05-13 05:59:23 +00:00
parent c0a2b70a9c
commit 7cab80f97c
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/gnus/ChangeLog
View file

@ -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

6
lisp/gnus/gnus-art.el
View file

@ -4822,7 +4822,11 @@ General format specifiers can also be used. See Info node
(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)))

2
lisp/gnus/mml1991.el
View file

@ -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)

1
lisp/gnus/mml2015.el
View file

@ -680,6 +680,7 @@ Whether the passphrase is cached at all is controlled by
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.)