diff options
| -rw-r--r-- | lisp/emacs-lisp/package.el | 6 | ||||
| -rw-r--r-- | lisp/epg-config.el | 4 | ||||
| -rw-r--r-- | lisp/epg.el | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 6156f651b62..b65e45b1bf6 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1452,7 +1452,7 @@ loading packages twice." (defvar package--downloads-in-progress nil "List of in-progress asynchronous downloads.") -(declare-function epg-configuration-find "epg-config" +(declare-function epg-find-configuration "epg-config" (protocol &optional force)) (declare-function epg-import-keys-from-file "epg" (context keys)) @@ -1555,9 +1555,9 @@ downloads in the background." (inhibit-message async)) (if (get 'package-check-signature 'saved-value) (when package-check-signature - (epg-configuration-find 'OpenPGP)) + (epg-find-configuration 'OpenPGP)) (setq package-check-signature - (if (epg-configuration-find 'OpenPGP) + (if (epg-find-configuration 'OpenPGP) 'allow-unsigned))) (when (and package-check-signature (file-exists-p default-keyring)) (condition-case-unless-debug error diff --git a/lisp/epg-config.el b/lisp/epg-config.el index 1d7706647db..8a208044cba 100644 --- a/lisp/epg-config.el +++ b/lisp/epg-config.el @@ -99,7 +99,7 @@ Emacs.") (defvar epg--configurations nil) ;;;###autoload -(defun epg-configuration-find (protocol &optional force) +(defun epg-find-configuration (protocol &optional force) "Find or create a usable configuration to handle PROTOCOL. This function first looks at the existing configuration found by the previous invocation of this function, unless FORCE is non-nil. @@ -190,7 +190,7 @@ entry until the version requirement is met." ;;;###autoload (defun epg-configuration () "Return a list of internal configuration parameters of `epg-gpg-program'." - (declare (obsolete epg-configuration-find "25.1")) + (declare (obsolete epg-find-configuration "25.1")) (epg-config--make-gpg-configuration epg-gpg-program)) (defun epg-config--parse-version (string) diff --git a/lisp/epg.el b/lisp/epg.el index 1a18ab2a52a..f4058ed35a4 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -186,7 +186,7 @@ compress-algorithm &aux (program - (let ((configuration (epg-configuration-find protocol))) + (let ((configuration (epg-find-configuration protocol))) (unless configuration (signal 'epg-error (list "no usable configuration" protocol))) |