Merge from origin/emacs-30

e8830015b07 Require ert-x for use by 'ert-font-lock-deftest-file'
a1841b4d8e7 ; * admin/authors.el (authors-aliases): Don't ignore "one...
69d8f9d1b70 Fix php-ts-mode font-lock for latest PHP grammar (bug#73516)
68f53e43488 eieio.texi: Fix bug#73505
53c887fdf6d ; cperl-mode.el: Fix an invalid face specification
f5cd5585f46 ; Recommend GNU Find for 'find-dired'
65e589698e6 ; * lisp/filesets.el (filesets-homepage): Fix URL.
1f243a97806 Delete duplicated line in Viper refcard
d63bff4d88f Fix Tramp shortdoc integration
759b18a33c0 * lisp/imenu.el (imenu-flatten): More limitations in docs...
794bb2a2e31 remember-data-file: Don't unconditionally call set-visite...
7766ba84199 Align columns in which-key with wide characters properly
bd25a98b4e7 bibtex-mode: fix patch bibtex validation for non-file buf...
4729065ee78 Document 'buttonize-region' in manual
f189457e5aa ; * lisp/yank-media.el (yank-media-handler): Fix docstrin...
2b53e11a087 Use black-on-white by default for doc-view-svg-face.
32d0c8f6af5 etags-regen-file-extensions: Enable for more extensions
8f265b49e3d ; Fix last change
c8ed48b9901 ; Improve documentation of 'append'
c1f2501f55d Update and improve UI of sql-read-product (bug#73412)
4f5fc519f09 Insert correct commit data into VC package descriptions
98177d4b3d1 Document reporting security issues in user manual
b986e2018a4 * BUGS: Minor copy edit.

2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/emacs-lisp/ert-font-lock.el b/lisp/emacs-lisp/ert-font-lock.el
index c6fd65e1507..58c6c0311cd 100644
--- a/lisp/emacs-lisp/ert-font-lock.el
+++ b/lisp/emacs-lisp/ert-font-lock.el
@@ -36,6 +36,7 @@
 ;;; Code:
 
 (require 'ert)
+(require 'ert-x)
 (require 'newcomment)
 (require 'pcase)
 
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 34610102aa0..e168096e153 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -265,13 +265,13 @@ asynchronously."
 
 (add-hook 'package-read-archive-hook     #'package-vc--read-archive-data 20)
 
-(defun package-vc-commit (pkg)
-  "Return the last commit of a development package PKG."
-  (cl-assert (package-vc-p pkg))
+(defun package-vc-commit (pkg-desc)
+  "Return the last commit of a development package PKG-DESC."
+  (cl-assert (package-vc-p pkg-desc))
   ;; FIXME: vc should be extended to allow querying the commit of a
   ;; directory (as is possible when dealing with git repositories).
   ;; This should be a fallback option.
-  (cl-loop with dir = (package-desc-dir pkg)
+  (cl-loop with dir = (package-desc-dir pkg-desc)
            for file in (directory-files dir t "\\.el\\'" t)
            when (vc-working-revision file) return it
            finally return "unknown"))
@@ -359,7 +359,11 @@ asynchronously."
                          requires))))
           (list :kind 'vc)
           (package--alist-to-plist-args
-           (package-desc-extras pkg-desc))))
+           (let ((extras (copy-alist (package-desc-extras pkg-desc))))
+             (setf (alist-get :commit extras)
+                   (package-vc-commit pkg-desc))
+             extras)
+           )))
         "\n")
        nil pkg-file nil 'silent))))