Naming fix for consistency

* lisp/epg-config.el (epg-find-configuration): Rename from
`epg-configuration-find' to be consistent with other epg-* functions.
Change all callers.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6156f651b62b657f9a8f6d3d47030336f1ef503d..b65e45b1bf68e50fbb49c4257f36478c8a1af5c8 100644 (file)
--- 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 1d7706647dbd5a92ca5540c83703b3a74f818e97..8a208044cba23940d590587033fcbf96f8c32abc 100644 (file)
--- 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 1a18ab2a52afd92aba052848d73af5b0e90ca20c..f4058ed35a496e59a39ab5dd8a8492f32d25a86f 100644 (file)
--- 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)))