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

Replace an usage of `epg-context-set-armor' with `setf'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8dbcb59..903f0e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2015-10-12  Nicolas Petton  <petton.nicolas@gmail.com>
 
 2015-10-12  Nicolas Petton  <petton.nicolas@gmail.com>
 

-       * auth-source.el (auth-source-do-debug, auth-source-do-trivia)
+       * auth-source.el (auth-source-epa-make-gpg-token):
+       Replace an usage of `epg-context-set-armor' with `setf'.
+       (auth-source-do-debug, auth-source-do-trivia)

        (auth-source-read-char-choice, auth-source-search)
        (auth-source-pick-first-password, auth-source-netrc-parse)
        (auth-source-netrc-search, auth-source-secrets-search)
        (auth-source-read-char-choice, auth-source-search)
        (auth-source-pick-first-password, auth-source-netrc-parse)
        (auth-source-netrc-search, auth-source-secrets-search)

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 7dfe69d..aff39c7 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)
   (let ((context (epg-make-context 'OpenPGP))
         (pp-escape-newlines nil)
         cipher)

-    (epg-context-set-armor context t)
+    (setf (epg-context-armor context) t)

     (epg-context-set-passphrase-callback
      context
      (cons #'auth-source-token-passphrase-callback-function
     (epg-context-set-passphrase-callback
      context
      (cons #'auth-source-token-passphrase-callback-function