auth-source.el (auth-source-epa-make-gpg-token): Revert

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b54aec1..9ea368d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * auth-source.el (auth-source-epa-make-gpg-token): Revert.
+
 2015-10-11  Nicolas Petton  <petton.nicolas@gmail.com>
 
        * auth-source.el (auth-source-epa-make-gpg-token):

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index aff39c7..7dfe69d 100644 (file)
--- 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