mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

Naming fix for consistency

Browse Source 
* lisp/epg-config.el (epg-find-configuration): Rename from
`epg-configuration-find' to be consistent with other epg-* functions.
Change all callers.
This commit is contained in:
Daiki Ueno 2016-02-21 07:26:40 +09:00
parent 74ec92da9e
commit d0f3b18fa9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/emacs-lisp/package.el
View File

@ -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

4
lisp/epg-config.el
View File

@ -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)

2
lisp/epg.el
View File

@ -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)))