From ec3f102b8cc6f7010a13f247d1eca2178ba04987 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic <philipk@posteo.net> Date: Sun, 30 Oct 2022 14:43:10 +0100 Subject: [PATCH] Prefer "Package-Version" over "Version" if available * lisp/emacs-lisp/package-vc.el (package-vc-release-rev): Search for both in sequence. --- lisp/emacs-lisp/package-vc.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 -- 2.39.5