diff options
| author | Andreas Schwab | 2010-04-01 17:34:05 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-04-01 17:34:05 +0200 |
| commit | d7b4879190af6e17673d8c3bdd0c71785bb4551e (patch) | |
| tree | eac0a5931e1cd9a932f7b5203a3ea41cbe78a023 /lisp | |
| parent | 8a14dec7ef880dea69f1102cc93387a13d73c301 (diff) | |
| download | emacs-d7b4879190af6e17673d8c3bdd0c71785bb4551e.tar.gz emacs-d7b4879190af6e17673d8c3bdd0c71785bb4551e.zip | |
Use correct coding system when verifying a pgp signed message
* mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system
if set.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/mm-uu.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0106e6212c5..8cbee9138c2 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-04-01 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system | ||
| 4 | if set. | ||
| 5 | |||
| 1 | 2010-03-29 Katsumi Yamaoka <yamaoka@jpl.org> | 6 | 2010-03-29 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | 7 | ||
| 3 | * mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag. | 8 | * mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag. |
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index c690713ef14..5ae9205e2f0 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el | |||
| @@ -486,9 +486,11 @@ apply the face `mm-uu-extract'." | |||
| 486 | (if (mm-uu-pgp-signed-test) | 486 | (if (mm-uu-pgp-signed-test) |
| 487 | (progn | 487 | (progn |
| 488 | (mml2015-clean-buffer) | 488 | (mml2015-clean-buffer) |
| 489 | (let ((coding-system-for-write (or gnus-newsgroup-charset | 489 | (let ((coding-system-for-write (or buffer-file-coding-system |
| 490 | gnus-newsgroup-charset | ||
| 490 | 'iso-8859-1)) | 491 | 'iso-8859-1)) |
| 491 | (coding-system-for-read (or gnus-newsgroup-charset | 492 | (coding-system-for-read (or buffer-file-coding-system |
| 493 | gnus-newsgroup-charset | ||
| 492 | 'iso-8859-1))) | 494 | 'iso-8859-1))) |
| 493 | (funcall (mml2015-clear-verify-function)))) | 495 | (funcall (mml2015-clear-verify-function)))) |
| 494 | (when (and mml2015-use (null (mml2015-clear-verify-function))) | 496 | (when (and mml2015-use (null (mml2015-clear-verify-function))) |