(defconst epg-config--program-alist
'((OpenPGP
epg-gpg-program
+ epg-config--make-gpg-configuration
("gpg2" . "2.1.6") ("gpg" . "1.4.3"))
(CMS
epg-gpgsm-program
+ epg-config--make-gpgsm-configuration
("gpgsm" . "2.0.4")))
"Alist used to obtain the usable configuration of executables.
The first element of each entry is protocol symbol, which is
either `OpenPGP' or `CMS'. The second element is a symbol where
-the executable name is remembered. The rest of the entry is an
-alist mapping executable names to the minimum required version
-suitable for the use with Emacs.")
-
-(defconst epg-config--configuration-constructor-alist
- '((OpenPGP . epg-config--make-gpg-configuration)
- (CMS . epg-config--make-gpgsm-configuration))
- "Alist used to obtain the usable configuration of executables.
-The first element of each entry is protocol symbol, which is
-either `OpenPGP' or `CMS'. The second element is a function
-which constructs a configuration object (actually a plist).")
+the executable name is remembered. The third element is a
+function which constructs a configuration object (actually a
+plist). The rest of the entry is an alist mapping executable
+names to the minimum required version suitable for the use with
+Emacs.")
(defvar epg--configurations nil)
;;;###autoload
-(defun epg-find-configuration (protocol &optional no-cache program-alist)
+(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 NO-CACHE is non-nil.
-
-Then it walks through PROGRAM-ALIST or
-`epg-config--program-alist'. If `epg-gpg-program' or
-`epg-gpgsm-program' is already set with custom, use it.
-Otherwise, it tries the programs listed in the entry until the
-version requirement is met."
- (unless program-alist
- (setq program-alist epg-config--program-alist))
- (let ((entry (assq protocol program-alist)))
+the previous invocation of this function, unless FORCE is non-nil.
+
+Then it walks through `epg-config--program-alist'. If
+`epg-gpg-program' or `epg-gpgsm-program' is already set with
+custom, use it. Otherwise, it tries the programs listed in the
+entry until the version requirement is met."
+ (let ((entry (assq protocol epg-config--program-alist)))
(unless entry
(error "Unknown protocol %S" protocol))
- (cl-destructuring-bind (symbol . alist)
+ (cl-destructuring-bind (symbol constructor . alist)
(cdr entry)
- (let ((constructor
- (alist-get protocol epg-config--configuration-constructor-alist)))
- (or (and (not no-cache) (alist-get protocol epg--configurations))
- ;; If the executable value is already set with M-x
- ;; customize, use it without checking.
- (if (and symbol (get symbol 'saved-value))
- (let ((configuration
- (funcall constructor (symbol-value symbol))))
- (push (cons protocol configuration) epg--configurations)
- configuration)
- (catch 'found
- (dolist (program-version alist)
- (let ((executable (executable-find (car program-version))))
- (when executable
- (let ((configuration
- (funcall constructor executable)))
- (when (ignore-errors
- (epg-check-configuration configuration
- (cdr program-version))
- t)
- (unless no-cache
- (push (cons protocol configuration)
- epg--configurations))
- (throw 'found configuration)))))))))))))
+ (or (and (not force) (alist-get protocol epg--configurations))
+ ;; If the executable value is already set with M-x
+ ;; customize, use it without checking.
+ (if (get symbol 'saved-value)
+ (let ((configuration (funcall constructor (symbol-value symbol))))
+ (push (cons protocol configuration) epg--configurations)
+ configuration)
+ (catch 'found
+ (dolist (program-version alist)
+ (let ((executable (executable-find (car program-version))))
+ (when executable
+ (let ((configuration
+ (funcall constructor executable)))
+ (when (ignore-errors
+ (epg-check-configuration configuration
+ (cdr program-version))
+ t)
+ (push (cons protocol configuration) epg--configurations)
+ (throw 'found configuration))))))))))))
;; Create an `epg-configuration' object for `gpg', using PROGRAM.
(defun epg-config--make-gpg-configuration (program)