[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 42ba620: Allow finding gpg2 binaries when gpg2 has
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 42ba620: Allow finding gpg2 binaries when gpg2 has an "unknown" version string |
Date: |
Mon, 26 Aug 2019 02:02:51 -0400 (EDT) |
branch: master
commit 42ba6200af10c00c72ac13912d6fb42a7af88058
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Allow finding gpg2 binaries when gpg2 has an "unknown" version string
* lisp/epg-config.el (epg-find-configuration): Allow finding a
usable configuration even if the version string looks like "gpg
(GnuPG) 2.2.15-unknown" (bug#35629).
---
lisp/epg-config.el | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 5432829..4a9cc77 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -148,7 +148,11 @@ 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)))
+ (let ((entry (assq protocol program-alist))
+ ;; In many gnupg distributions (especially on Windows), the
+ ;; version string is "gpg (GnuPG) 2.2.15-unknown" or the like.
+ (version-regexp-alist (cons '("^[-._+ ]?unknown$" . -4)
+ version-regexp-alist)))
(unless entry
(error "Unknown protocol %S" protocol))
(cl-destructuring-bind (symbol . alist)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 42ba620: Allow finding gpg2 binaries when gpg2 has an "unknown" version string,
Lars Ingebrigtsen <=