[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 74ec92d 1/2: Prefer customized value for GnuPG ex
From: |
Daiki Ueno |
Subject: |
[Emacs-diffs] emacs-25 74ec92d 1/2: Prefer customized value for GnuPG executable |
Date: |
Sat, 20 Feb 2016 22:59:01 +0000 |
branch: emacs-25
commit 74ec92da9e0430728ac9496d3b1e50f0bb5dae3a
Author: Daiki Ueno <address@hidden>
Commit: Daiki Ueno <address@hidden>
Prefer customized value for GnuPG executable
* lisp/epg-config.el (epg-configuration-find): Don't check GPG
configuration if it is already set with custom. (Bug#22747)
---
lisp/epg-config.el | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 1736456..1d77066 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -114,16 +114,15 @@ entry until the version requirement is met."
(cl-destructuring-bind (symbol constructor . alist)
(cdr entry)
(or (and (not force) (alist-get protocol epg--configurations))
- (let ((executable (get symbol 'saved-value)))
- (if executable
- (ignore-errors
- (let ((configuration (funcall constructor executable)))
- (epg-check-configuration configuration)
- (push (cons protocol configuration) epg--configurations)
- configuration))
- (catch 'found
- (dolist (program-version alist)
- (setq executable (executable-find (car program-version)))
+ ;; 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)))