From: Stefan Kangas Date: Thu, 10 Sep 2020 17:32:33 +0000 (+0200) Subject: Use lexical-binding in mml-sec-tests.el X-Git-Tag: emacs-28.0.90~6146 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be4c4a7389cf0a47bc2c3e2896d4d0e2f09daa16;p=emacs.git Use lexical-binding in mml-sec-tests.el * test/lisp/gnus/mml-sec-tests.el: Use lexical-binding. (mml-secure-test-mail-fixture) (mml-secure-test-en-decrypt-with-passphrase): Fix warnings. --- diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el index 673fa6984a1..0911932665d 100644 --- a/test/lisp/gnus/mml-sec-tests.el +++ b/test/lisp/gnus/mml-sec-tests.el @@ -1,4 +1,4 @@ -;;; gnustest-mml-sec.el --- Tests mml-sec.el, see README-mml-secure.txt. +;;; mml-sec-tests.el --- Tests mml-sec.el, see README-mml-secure.txt. -*- lexical-binding:t -*- ;; Copyright (C) 2015 Free Software Foundation, Inc. ;; Author: Jens Lechtenbörger @@ -51,6 +51,8 @@ Mostly, the empty passphrase is used. However, the keys for '(sign-pgp sign-pgp-mime sign-smime) '(sign-pgp sign-pgp-mime))) +(defvar mml-smime-use) + (defun mml-secure-test-fixture (body &optional interactive) "Setup GnuPG home containing test keys and prepare environment for BODY. If optional INTERACTIVE is non-nil, allow questions to the user in case of @@ -120,9 +122,9 @@ Subject: Test Pass optional INTERACTIVE to mml-secure-test-fixture." (mml-secure-test-fixture (lambda () - (let ((context (if (memq method '(enc-smime enc-sign-smime sign-smime)) - (epg-make-context 'CMS) - (epg-make-context 'OpenPGP))) + (let ((_context (if (memq method '(enc-smime enc-sign-smime sign-smime)) + (epg-make-context 'CMS) + (epg-make-context 'OpenPGP))) ;; Verify and decrypt by default. (mm-verify-option 'known) (mm-decrypt-option 'known) @@ -546,6 +548,10 @@ Pass optional INTERACTIVE to mml-secure-test-mail-fixture." )))))) interactive)) +(defvar mml-smime-cache-passphrase) +(defvar mml2015-cache-passphrase) +(defvar mml1991-cache-passphrase) + (defun mml-secure-test-en-decrypt-with-passphrase (method to from checksig jl-passphrase do-cache &optional enc-keys expectfail) @@ -562,7 +568,7 @@ If optional EXPECTFAIL is non-nil, a decryption failure is expected." (mml-smime-cache-passphrase do-cache) ) (cl-letf (((symbol-function 'read-passwd) - (lambda (prompt &optional confirm default) jl-passphrase))) + (lambda (_prompt &optional _confirm _default) jl-passphrase))) (mml-secure-test-en-decrypt method to from checksig t enc-keys expectfail) ))) @@ -897,4 +903,4 @@ So the second decryption fails." (let ((with-smime nil)) (ert-run-tests-batch))) -;;; gnustest-mml-sec.el ends here +;;; mml-sec-tests.el ends here