From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 30 Oct 2022 13:43:10 +0000 (+0100)
Subject: Prefer "Package-Version" over "Version" if available
X-Git-Tag: emacs-29.0.90~1616^2~307^2~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec3f102b8cc6f7010a13f247d1eca2178ba04987;p=emacs.git

Prefer "Package-Version" over "Version" if available

* lisp/emacs-lisp/package-vc.el (package-vc-release-rev): Search for
both in sequence.
---

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index ab1bffdd21d..608d06d426b 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -486,8 +486,13 @@ If no such revision can be found, return nil."
     (save-excursion
       (goto-char (point-min))
       (let ((case-fold-search t))
-        (when (re-search-forward (concat (lm-get-header-re "version") ".*$")
-                                 (lm-code-start) t)
+        (when (cond
+               ((re-search-forward
+                 (concat (lm-get-header-re "package-version") ".*$")
+                 (lm-code-start) t))
+               ((re-search-forward
+                 (concat (lm-get-header-re "version") ".*$")
+                 (lm-code-start) t)))
           (ignore-error vc-not-supported
             (vc-call-backend (vc-backend (buffer-file-name))
                              'last-change