mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Add -unknown to version-regexp-alist

Browse Source 
* 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).
This commit is contained in:
Lars Ingebrigtsen 2019-10-13 04:59:44 +02:00
parent db443618ea
commit e1a4ed67b3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/epg-config.el
View File

@ -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)

2
lisp/subr.el
View File

@ -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))