diff options
| -rw-r--r-- | lisp/epg-config.el | 6 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lisp/epg-config.el b/lisp/epg-config.el index 4a9cc7744cb..54328290c8f 100644 --- a/lisp/epg-config.el +++ b/lisp/epg-config.el @@ -148,11 +148,7 @@ 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)) - ;; 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))) + (let ((entry (assq protocol program-alist))) (unless entry (error "Unknown protocol %S" protocol)) (cl-destructuring-bind (symbol . alist) diff --git a/lisp/subr.el b/lisp/subr.el index e50a52e2f53..76b0e4b3944 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -5325,6 +5325,8 @@ Usually the separator is \".\", but it can be any other string.") ("^[-._+]$" . -4) ;; treat "1.2.3-CVS" as snapshot release ("^[-._+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)$" . -4) + ;; treat "-unknown" the same as snapshots. + ("^[-._+ ]?unknown$" . -4) ("^[-._+ ]?alpha$" . -3) ("^[-._+ ]?beta$" . -2) ("^[-._+ ]?\\(pre\\|rc\\)$" . -1)) |