From a433abbb29682095c58b0b915966b575129ab223 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Thu, 3 Oct 2002 23:46:25 +0000 Subject: [PATCH] * pgg.el (pgg-encrypt-region): Support sign. * pgg-gpg.el (pgg-gpg-encrypt-region): Ditto. * mml2015.el (mml2015-pgg-encrypt): Ditto. --- lisp/ChangeLog | 6 ++++++ lisp/mml2015.el | 3 ++- lisp/pgg-gpg.el | 8 +++++--- lisp/pgg.el | 7 ++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 764ea342e..0396f868b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2002-10-04 Simon Josefsson + * pgg.el (pgg-encrypt-region): Support sign. + + * pgg-gpg.el (pgg-gpg-encrypt-region): Ditto. + + * mml2015.el (mml2015-pgg-encrypt): Ditto. + * pgg.el, pgg-def.el, pgg-parse.el, pgg-gpg.el, pgg-pgp5.el, pgg-pgp6.el: Moved from ../pgg/. Modifications compared to EMIKO branch where PGG was taken from in the ChangeLog entries below. diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 846ddd099..7e8cb286f 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -817,7 +817,8 @@ by you.") (message-options-get 'message-recipients) (message-options-set 'message-recipients (read-string "Recipients: "))) - "[ \f\t\n\r\v,]+")) + "[ \f\t\n\r\v,]+") + sign) (pop-to-buffer mml2015-result-buffer) (error "Encrypt error")) (delete-region (point-min) (point-max)) diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index 4c347c274..8c828d21f 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -123,11 +123,13 @@ (progn (end-of-line)(point))) ":")) 8))))) -(defun pgg-gpg-encrypt-region (start end recipients) - "Encrypt the current region between START and END." +(defun pgg-gpg-encrypt-region (start end recipients &optional sign) + "Encrypt the current region between START and END. +If optional argument SIGN is non-nil, do a combined sign and encrypt." (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id)) (args - `("--batch" "--armor" "--always-trust" "--encrypt" + `("--batch" "--armor" "--always-trust" + (if sign "--sign --encrypt" "--encrypt") ,@(if recipients (apply #'nconc (mapcar (lambda (rcpt) diff --git a/lisp/pgg.el b/lisp/pgg.el index 536da3b61..54b106af9 100644 --- a/lisp/pgg.el +++ b/lisp/pgg.el @@ -153,15 +153,16 @@ ;;; ;;;###autoload -(defun pgg-encrypt-region (start end rcpts) - "Encrypt the current region between START and END for RCPTS." +(defun pgg-encrypt-region (start end rcpts &optional sign) + "Encrypt the current region between START and END for RCPTS. +If optional argument SIGN is non-nil, do a combined sign and encrypt." (interactive (list (region-beginning)(region-end) (split-string (read-string "Recipients: ") "[ \t,]+"))) (let ((status (pgg-save-coding-system start end (pgg-invoke "encrypt-region" (or pgg-scheme pgg-default-scheme) - (point-min) (point-max) rcpts)))) + (point-min) (point-max) rcpts sign)))) (when (interactive-p) (pgg-display-output-buffer start end status)) status)) -- 2.34.1