[Emacs-diffs] Changes to emacs/lisp/pgg-pgp5.el

[Eli Zaretskii]

Index: emacs/lisp/pgg-pgp5.el
diff -c emacs/lisp/pgg-pgp5.el:1.1 emacs/lisp/pgg-pgp5.el:1.2
*** emacs/lisp/pgg-pgp5.el:1.1  Mon Oct 24 09:46:27 2005
--- emacs/lisp/pgg-pgp5.el      Fri Nov  4 14:41:26 2005
***************
*** 143,183 ****
                 (buffer-substring (match-end 0)(progn (end-of-line)(point)))))
         2)))))
  
! (defun pgg-pgp5-encrypt-region (start end recipients &optional sign)
    "Encrypt the current region between START and END."
    (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
         (args
!         `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
!           ,@(if recipients
!                 (apply #'append
!                        (mapcar (lambda (rcpt)
!                                  (list "-r"
!                                        (concat "\"" rcpt "\"")))
!                                (append recipients
!                                        (if pgg-encrypt-for-me
!                                            (list pgg-pgp5-user-id)))))))))
      (pgg-pgp5-process-region start end nil pgg-pgp5-pgpe-program args)
      (pgg-process-when-success nil)))
  
! (defun pgg-pgp5-decrypt-region (start end)
    "Decrypt the current region between START and END."
    (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
         (passphrase
!         (pgg-read-passphrase
!          (format "PGP passphrase for %s: " pgg-pgp5-user-id)
!          (pgg-pgp5-lookup-key pgg-pgp5-user-id 'encrypt)))
         (args
          '("+verbose=1" "+batchmode=1" "+language=us" "-f")))
      (pgg-pgp5-process-region start end passphrase pgg-pgp5-pgpv-program args)
      (pgg-process-when-success nil)))
  
! (defun pgg-pgp5-sign-region (start end &optional clearsign)
    "Make detached signature from text between START and END."
    (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
         (passphrase
!         (pgg-read-passphrase
!          (format "PGP passphrase for %s: " pgg-pgp5-user-id)
!          (pgg-pgp5-lookup-key pgg-pgp5-user-id 'sign)))
         (args
          (list (if clearsign "-fat" "-fbat")
                "+verbose=1" "+language=us" "+batchmode=1"
--- 143,193 ----
                 (buffer-substring (match-end 0)(progn (end-of-line)(point)))))
         2)))))
  
! (defun pgg-pgp5-encrypt-region (start end recipients &optional sign 
passphrase)
    "Encrypt the current region between START and END."
    (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
+        (passphrase (or passphrase
+                          (when sign
+                            (pgg-read-passphrase
+                             (format "PGP passphrase for %s: "
+                                     pgg-pgp5-user-id)
+                             pgg-pgp5-user-id))))
         (args
!           (append
!            `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
!              ,@(if recipients
!                    (apply #'append
!                           (mapcar (lambda (rcpt)
!                                     (list "-r"
!                                           (concat "\"" rcpt "\"")))
!                                   (append recipients
!                                           (if pgg-encrypt-for-me
!                                               (list pgg-pgp5-user-id)))))))
!            (if sign '("-s" "-u" pgg-pgp5-user-id)))))
      (pgg-pgp5-process-region start end nil pgg-pgp5-pgpe-program args)
      (pgg-process-when-success nil)))
  
! (defun pgg-pgp5-decrypt-region (start end &optional passphrase)
    "Decrypt the current region between START and END."
    (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
         (passphrase
!           (or passphrase
!               (pgg-read-passphrase
!                (format "PGP passphrase for %s: " pgg-pgp5-user-id)
!                (pgg-pgp5-lookup-key pgg-pgp5-user-id 'encrypt))))
         (args
          '("+verbose=1" "+batchmode=1" "+language=us" "-f")))
      (pgg-pgp5-process-region start end passphrase pgg-pgp5-pgpv-program args)
      (pgg-process-when-success nil)))
  
! (defun pgg-pgp5-sign-region (start end &optional clearsign passphrase)
    "Make detached signature from text between START and END."
    (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
         (passphrase
!           (or passphrase
!               (pgg-read-passphrase
!                (format "PGP passphrase for %s: " pgg-pgp5-user-id)
!                (pgg-pgp5-lookup-key pgg-pgp5-user-id 'sign))))
         (args
          (list (if clearsign "-fat" "-fbat")
                "+verbose=1" "+language=us" "+batchmode=1"
***************
*** 191,197 ****
                                    (point))
                             (point-max))))))
          (if pgg-cache-passphrase
!             (pgg-add-passphrase-cache
               (cdr (assq 'key-identifier packet))
               passphrase)))))))
  
--- 201,207 ----
                                    (point))
                             (point-max))))))
          (if pgg-cache-passphrase
!             (pgg-add-passphrase-to-cache
               (cdr (assq 'key-identifier packet))
               passphrase)))))))