[gnus git] branch master updated: m0-13-82-g3640deb =1= auth-source.el (auth-source-epa-make-gpg-token): Revert

Katsumi Yamaoka <[email protected]> Wed, 14 Oct 2015 02:59:53 +0200
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  3640deb5d616812fe3f601ef0d98ecd91006d0c7 (commit)
      from  0ebae9463770faa56f4c4c148d0382fb02a320df (commit)


- Log -----------------------------------------------------------------
commit 3640deb5d616812fe3f601ef0d98ecd91006d0c7
Author: Katsumi Yamaoka <[email protected]>
Date:   Wed Oct 14 00:59:28 2015 +0000

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b54aec1..9ea368d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-14  Katsumi Yamaoka  <[email protected]>
+
+	* auth-source.el (auth-source-epa-make-gpg-token): Revert.
+
 2015-10-11  Nicolas Petton  <[email protected]>
 
 	* 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
--- 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

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog      |    4 ++++
 lisp/auth-source.el |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project