From 305452a5903e59a1de841ddf6f342918d3068462 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sat, 29 Apr 2006 03:51:50 +0000 Subject: [PATCH] Revision: emacs@sv.gnu.org/emacs--devo--0--patch-252 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 96-97) - Update from CVS --- lisp/gnus/ChangeLog | 48 ++++++++++++++++++++++++++++++++++++++++++++ lisp/gnus/mml1991.el | 25 +++++++++-------------- 2 files changed, 58 insertions(+), 15 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2976d0db3e4..c547166bfa7 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,39 @@ +2006-04-27 Katsumi Yamaoka + + * lpath.el: Don't fbind string-as-multibyte for XEmacs. + + * pgg-gpg.el (pgg-string-to-multibyte): Remove. + (pgg-gpg-process-region): Revert. + + * pgg-pgp.el (pgg-pgp-process-region): Revert. + (pgg-pgp-lookup-key): Revert. + + * pgg-pgp5.el (pgg-pgp5-process-region): Revert. + (pgg-pgp5-lookup-key): Revert. + + * pgg.el (pgg-fetch-key): Revert. + +2006-04-27 Katsumi Yamaoka + + * lpath.el: Fbind make-network-process for both Emacs and XEmacs; + fbind string-as-multibyte for XEmacs. + + * mml1991.el (mml1991-pgg-sign): No need to load pgg.el, which is + always loaded by way of gnus-art.el -> mm-uu.el -> mml2015.el. + (mml1991-pgg-encrypt): Ditto. + + * pgg-gpg.el (pgg-string-to-multibyte): New function. + (pgg-gpg-process-region): Make sure pgg-output-buffer is always + a multibyte buffer. + + * pgg-pgp.el (pgg-pgp-process-region): Ditto. + (pgg-pgp-lookup-key): Ditto. + + * pgg-pgp5.el (pgg-pgp5-process-region): Ditto. + (pgg-pgp5-lookup-key): Ditto. + + * pgg.el (pgg-fetch-key): Ditto. + 2006-04-26 Reiner Steib * deuglify.el (gnus-outlook-deuglify-unwrap-min) @@ -21,6 +57,18 @@ (mml-attach-file, mml-attach-buffer, mml-attach-external): Sync DND support and use of message-in-body-p from the trunk. +2006-04-26 Katsumi Yamaoka + + * mml1991.el (mml1991-pgg-sign): Make sure to load pgg.el before + binding pgg-* variables; reimplement the section which prevents + MIME header from being signed. + (mml1991-pgg-encrypt): Make sure to load pgg.el before binding + pgg-text-mode; remove a blank line at the top of body. + + * mm-uu.el (mm-uu-pgp-encrypted-extract-1): Don't remove blank + lines at the top of body; use gnus-newsgroup-charset if there's no + Charset header. + 2006-04-25 Andreas Seltenreich * nnweb.el (nnweb-google-wash-article): Sync up to new Google diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 23953cd6208..4db3540aec1 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -229,8 +229,6 @@ (defvar pgg-output-buffer)) (defun mml1991-pgg-sign (cont) - ;; Make sure to load pgg.el before binding pgg-* variables. - (require 'pgg) (let ((pgg-text-mode t) (pgg-default-user-id (or (message-options-get 'mml-sender) pgg-default-user-id)) @@ -275,19 +273,16 @@ (delete-region (point-min) (point)) (when cte (mm-decode-content-transfer-encoding (intern (downcase cte)))))) - (unless (progn - ;; Make sure to load pgg.el before binding `pgg-text-mode'. - (require 'pgg) - (let ((pgg-text-mode t)) - (pgg-encrypt-region - (point-min) (point-max) - (split-string - (or - (message-options-get 'message-recipients) - (message-options-set 'message-recipients - (read-string "Recipients: "))) - "[ \f\t\n\r\v,]+") - sign))) + (unless (let ((pgg-text-mode t)) + (pgg-encrypt-region + (point-min) (point-max) + (split-string + (or + (message-options-get 'message-recipients) + (message-options-set 'message-recipients + (read-string "Recipients: "))) + "[ \f\t\n\r\v,]+") + sign)) (pop-to-buffer pgg-errors-buffer) (error "Encrypt error")) (delete-region (point-min) (point-max))