summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2010-04-01 17:34:05 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2010-04-01 17:34:05 +0200
commitd7b4879190af6e17673d8c3bdd0c71785bb4551e (patch)
treeeac0a5931e1cd9a932f7b5203a3ea41cbe78a023
parent8a14dec7ef880dea69f1102cc93387a13d73c301 (diff)
downloademacs-d7b4879190af6e17673d8c3bdd0c71785bb4551e.tar.gz
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.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/mm-uu.el6
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 @@
+2010-04-01 Andreas Schwab <schwab@linux-m68k.org>
+
+ * mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system
+ if set.
+
2010-03-29 Katsumi Yamaoka <yamaoka@jpl.org>
* 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'."
(if (mm-uu-pgp-signed-test)
(progn
(mml2015-clean-buffer)
- (let ((coding-system-for-write (or gnus-newsgroup-charset
+ (let ((coding-system-for-write (or buffer-file-coding-system
+ gnus-newsgroup-charset
'iso-8859-1))
- (coding-system-for-read (or gnus-newsgroup-charset
+ (coding-system-for-read (or buffer-file-coding-system
+ gnus-newsgroup-charset
'iso-8859-1)))
(funcall (mml2015-clear-verify-function))))
(when (and mml2015-use (null (mml2015-clear-verify-function)))