diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-10-13 04:59:44 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-10-13 04:59:44 +0200 |
| commit | e1a4ed67b3cf232c7a05169db32141ca0a682a11 (patch) | |
| tree | 2955d21784c5b5639cc2877c9fe39eb9e909fc3a | |
| parent | db443618eae74822f96d9adc3c7152355ac749b3 (diff) | |
| download | emacs-e1a4ed67b3cf232c7a05169db32141ca0a682a11.tar.gz | |
Add -unknown to version-regexp-alist
* lisp/epg-config.el (epg-find-configuration): Remove the -unknown
hack, because it led to further problems later when comparing
versions.
* lisp/subr.el (version-regexp-alist): Rate -unknown versions the
same as -alpha releases (bug#37556).
| -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)) |