diff options
| author | Glenn Morris | 2017-03-11 17:21:20 -0800 |
|---|---|---|
| committer | Glenn Morris | 2017-03-11 17:21:20 -0800 |
| commit | cce29d942dc62f39664e890fbf210a6568df4594 (patch) | |
| tree | afc9c57d466b0d3adefb0b0846504f112b06c36f | |
| parent | 46fcaf3361b56306c288f2ddf4dd8a7dfab7ce2f (diff) | |
| download | emacs-cce29d942dc62f39664e890fbf210a6568df4594.tar.gz emacs-cce29d942dc62f39664e890fbf210a6568df4594.zip | |
Small epg-find-configuration improvement
* lisp/epg-config.el (epg-find-configuration):
Handle epg-gpg-program customized but not saved. (Bug#25947)
| -rw-r--r-- | lisp/epg-config.el | 3 |
1 files changed, 2 insertions, 1 deletions
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." | |||
| 129 | (or (and (not no-cache) (alist-get protocol epg--configurations)) | 129 | (or (and (not no-cache) (alist-get protocol epg--configurations)) |
| 130 | ;; If the executable value is already set with M-x | 130 | ;; If the executable value is already set with M-x |
| 131 | ;; customize, use it without checking. | 131 | ;; customize, use it without checking. |
| 132 | (if (and symbol (get symbol 'saved-value)) | 132 | (if (and symbol (or (get symbol 'saved-value) |
| 133 | (get symbol 'customized-value))) | ||
| 133 | (let ((configuration | 134 | (let ((configuration |
| 134 | (funcall constructor (symbol-value symbol)))) | 135 | (funcall constructor (symbol-value symbol)))) |
| 135 | (push (cons protocol configuration) epg--configurations) | 136 | (push (cons protocol configuration) epg--configurations) |