From: Glenn Morris <rgm@gnu.org>
Date: Sun, 12 Mar 2017 01:21:20 +0000 (-0800)
Subject: Small epg-find-configuration improvement
X-Git-Tag: emacs-26.0.90~592
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cce29d942dc62f39664e890fbf210a6568df4594;p=emacs.git

Small epg-find-configuration improvement

* lisp/epg-config.el (epg-find-configuration):
Handle epg-gpg-program customized but not saved.  (Bug#25947)
---

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index ea1ae6c439f..611f984106d 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -129,7 +129,8 @@ version requirement is met."
         (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))
+            (if (and symbol (or (get symbol 'saved-value)
+                                (get symbol 'customized-value)))
                 (let ((configuration
                        (funcall constructor (symbol-value symbol))))
                   (push (cons protocol configuration) epg--configurations)