From 3640deb5d616812fe3f601ef0d98ecd91006d0c7 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Wed, 14 Oct 2015 00:59:28 +0000 Subject: [PATCH] auth-source.el (auth-source-epa-make-gpg-token): Revert --- lisp/ChangeLog | 4 ++++ lisp/auth-source.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b54aec199..9ea368d0c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-10-14 Katsumi Yamaoka + + * auth-source.el (auth-source-epa-make-gpg-token): Revert. + 2015-10-11 Nicolas Petton * auth-source.el (auth-source-epa-make-gpg-token): diff --git a/lisp/auth-source.el b/lisp/auth-source.el index aff39c7a8..7dfe69d0f 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -1162,7 +1162,7 @@ FILE is the file from which we obtained this token." (let ((context (epg-make-context 'OpenPGP)) (pp-escape-newlines nil) cipher) - (setf (epg-context-armor context) t) + (epg-context-set-armor context t) (epg-context-set-passphrase-callback context (cons #'auth-source-token-passphrase-callback-function -- 2.25.1