;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Code:
+(require 'mel) ; binary-to-text-funcall, binary-write-decoded-region
(eval-when-compile (require 'pgg))
(defgroup pgg-pgp ()
(luna-make-entity 'pgg-scheme-pgp))))
(defun pgg-pgp-process-region (start end passphrase program args)
- (let* ((errors-file-name
- (concat temporary-file-directory
- (make-temp-name "pgg-errors")))
+ (let* ((errors-file-name (make-temp-file "pgg-errors"))
(args
(append args
pgg-pgp-extra-args
(unwind-protect
(progn
(setq process
- (apply #'binary-start-process-shell-command "*PGP*"
- output-buffer
+ (apply #'binary-funcall
+ #'start-process-shell-command "*PGP*" output-buffer
program args))
(set-process-sentinel process #'ignore)
(when passphrase
(luna-define-method pgg-scheme-verify-region ((scheme pgg-scheme-pgp)
start end &optional signature)
- (let* ((basename (expand-file-name "pgg" temporary-file-directory))
- (orig-file (make-temp-name basename))
- (args '("+verbose=1" "+batchmode" "+language=us"))
- (orig-mode (default-file-modes)))
+ (let ((orig-file (make-temp-file "pgg"))
+ (args '("+verbose=1" "+batchmode" "+language=us"))
+ (orig-mode (default-file-modes)))
(unwind-protect
(progn
(set-default-file-modes 448)
- (binary-write-region start end orig-file))
+ (binary-write-decoded-region start end orig-file))
(set-default-file-modes orig-mode))
(when (stringp signature)
(copy-file signature (setq signature (concat orig-file ".asc")))
(luna-define-method pgg-scheme-snarf-keys-region ((scheme pgg-scheme-pgp)
start end)
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
- (basename (expand-file-name "pgg" temporary-file-directory))
- (key-file (make-temp-name basename))
+ (key-file (make-temp-file "pgg"))
(args
(list "+verbose=1" "+batchmode" "+language=us" "-kaf"
key-file)))