From d1c0ea6a18fe23e880d2346f6578f667e9881de4 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Sat, 2 Nov 2013 12:55:22 +0200 Subject: [PATCH] * lisp/emacs-lisp/package.el (package-version-join): Recognize snapshot versions. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/package.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b2ba7d5e207..8639cf4fbe3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-11-02 Bozhidar Batsov + + * emacs-lisp/package.el (package-version-join): Recognize + snapshot versions. + 2013-11-02 Bozhidar Batsov * subr.el (version-regexp-alist): Add support for snapshot versions. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 957c516f5d3..056bc9bd19b 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -429,7 +429,7 @@ This is, approximately, the inverse of `version-to-list'. ((>= num 0) (push (int-to-string num) str-list) (push "." str-list)) - ((< num -3) + ((< num -4) (error "Invalid version list `%s'" vlist)) (t ;; pre, or beta, or alpha @@ -439,7 +439,8 @@ This is, approximately, the inverse of `version-to-list'. (error "Invalid version list `%s'" vlist))) (push (cond ((= num -1) "pre") ((= num -2) "beta") - ((= num -3) "alpha")) + ((= num -3) "alpha") + ((= num -4) "snapshot")) str-list)))) (if (equal "." (car str-list)) (pop str-list)) -- 2.39.2