Mercurial > emacs
diff lisp/gnus/mml1991.el @ 70265:76465e48c749
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 29 Apr 2006 03:51:50 +0000 |
parents | 322c5c5027dc |
children | e3694f1cb928 |
line wrap: on
line diff
--- a/lisp/gnus/mml1991.el Sat Apr 29 01:26:12 2006 +0000 +++ b/lisp/gnus/mml1991.el Sat Apr 29 03:51:50 2006 +0000 @@ -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))