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 ab1bffdd21de88332e95daf2eb1b8ce85b008970..608d06d426b6070ed186111eae9e2946c54c6efe 100644 (file)
--- 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