Merge from savannah/emacs-30

e6c72aec9d7 ; Fix typos
9ffa38d3925 Eglot: fix completion highlighting (bug#72824)
d6880bc24dd ; * admin/make-tarball.txt: Document gotcha.
afee71273b7 Discuss commit log messages on feature branches
77302ccb6aa * admin/authors.el (authors-fixed-entries): Update docstr...
3a4839d1427 More consistent treesit-forward-sexp around comments (bug...
31293155879 Improve php-ts-mode font lock and support latest grammar ...
b8c05d73a11 Fix tree-sitter local parser overlay cleanup routine
aa6ed7f67ec Fix copyright years by hand (Bug#72809)

5 files changed, 85 insertions, 3 deletions

diff --git a/admin/authors.el b/admin/authors.el
index 9043b5f3840..75843e259ae 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -910,8 +910,11 @@ Changes to files in this list are not listed.")
     ("Garrett Wollman" :changed "sendmail.el")
     ("Dale R. Worley" :changed "mail-extr.el")
     ("Jamie Zawinski" :changed "bytecode.c" :wrote "tar-mode.el"
-     :cowrote "disass.el"))
-  "Actions taken from the original, manually (un)maintained AUTHORS file.")
+     :cowrote "disass.el")
+    ("Andrea Corallo" :wrote "comp.c"))
+  "Manual fixes to the list of actions taken.
+These are mostly taken from the original, manually (un)maintained
+AUTHORS file.  There are also some more recent manual additions.")
 
 
 (defconst authors-valid-file-names
diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude
index 02b7c84c2f4..1dc4fb8f014 100644
--- a/admin/codespell/codespell.exclude
+++ b/admin/codespell/codespell.exclude
@@ -1685,3 +1685,62 @@ argument \\='general-category, is Decimal_Numbers (Nd).  It returns
      ("ro" :default "Continuare de pe pagina precedentă")
      ("ro" :default "Continuare pe pagina următoare")
 ;;            avk@rtsg.mot.com (Andrew V. Klein)     for a Dired tip.
+Mitchell, Gergely Nagy, Michael Olson, Per Persson, Jorgen Sch@"afer,
+Fran@,{c}ois Pinard, Greg McGary, and Bruno Haible wrote @file{po.el},
+Pieri, Fred Pierresteguy, Fran@,{c}ois Pinard, Daniel Pittman, Christian
+Timo Savola, Jorgen Sch@"afer, Holger Schauer, William Schelter, Ralph
+        f9832e80b89 ; * lisp/textmodes/ispell.el (ispell-message): Add commen...
+        0bebd0e5f09 ; Remove 'build-module' and 'html-manual' directories fro...
+        1014bcc8e32 Fix fontification of method-invocations in js-ts-mode (bu...
+        1b9812af80b ; * etc/PROBLEMS: Document problem with GnuPG 2.4.1.  (Bu...
+        1fb2fb501f3 typescript-ts-mode, tsx-ts-mode: Fix syntax properties fo...
+        399433cc2b9 * lisp/progmodes/project.el: Filter out empty strings fro...
+        46fe7a17f53 Fix dragging mode line on text terminals with a mouse (bu...
+        4bf7cb71edc Fix go-ts-mode indentation and set indent offset to 8 (Bu...
+        527eb11de20 * lisp/minibuffer.el (completions-group-separator): Rever...
+        5b34fc07085 * lisp/treesit.el (treesit-node-at): Update docstring (bu...
+        5cf1de683b2 Fix python-fill-paragraph problems on filling strings (bu...
+        7678b7e46f2 Eglot: check server capability before sending didSave (bu...
+        7678b7e46f2 Eglot: check server capability before sending didSave (bu...
+        9ac12592781 Fix display of menu-bar bindings of commands in *Help* bu...
+        9ac12592781 Fix display of menu-bar bindings of commands in *Help* bu...
+        9e105d483fa Fix c-ts-mode indentation for statement after preproc (bu...
+        When running emacs in a terminal (or at least, in iTerm), keys are not
+        b464e6c490b Make last change of w32 GUI dialogs conditional and rever...
+        b916ec88b2f Make eglot-ensure's post-command-hook run a bit later (bu...
+        e551dd72f79 * etc/PROBLEMS: Add entry about pinentry with gpgsm.  (Bu...
+        ed4cd3eddf7 dockerfile-ts-mode: Prevent empty categories in imenu (Bu...
+        edd36786e1e ; * lisp/bookmark.el (bookmark-bmenu-locate): Doc fix (bu...
+        f102145d381 ; * etc/PROBLEMS: Describe problems with MuPDF 1.21.  (Bu...
+        f49fe936abd * etc/NEWS: Note dotimes loop variable scoping change (bu...
+        performance reasons.  Fix a bug that could cause ghost (mis)matches
+2023-03-02  Sebastian Tennant  <sdt@sebyte.me>  (tiny change)
+2023-03-26  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-01  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-09  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-11  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-12  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-14  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-15  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-17  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-18  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-04-30  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-05-06  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-06-20  Andrew G Cohen  <cohen@andy.bu.edu>
+2023-07-05  Andrew G Cohen  <cohen@andy.bu.edu>
+2024-05-10  Andrew G Cohen  <cohen@andy.bu.edu>
+        ce0ebb91f25 Improve documentation of read syntax and printed represen...
+        e110312ad95 ; * doc/lispref/minibuf.texi (Text from Minibuffer): Ment...
+2023-07-08  Vladimir Sedach  <vas@oneofus.la>
+        90fc6b987ad * lisp/savehist.el (savehist-save): Preserve shared struc...
+        ed3bab3cc72 Revert 'forward-sentence-default-function' to return poin...
+        b3e930d328e Revert inadvertent change to lisp/icomplete.el in previou...
+        973c1d24c6a ruby-ts-mode: Also don't reindent 'identifier' when insid...
+        973c1d24c6a ruby-ts-mode: Also don't reindent 'identifier' when insid...
+        e444115d026 Improve keymap-global-set and keymap-local-set interactiv...
+        8e9783b4ce4 Rebind in read-regexp-map ‘M-c’ to ‘M-s c’ compatible wit...
+        f12f72b0e09 ; * lisp/simple.el (primitive-undo): Clarify error messag...
+        cf327766226 ; * doc/lispref/parsing.texi (Using Parser): Remove delet...
+        b211a63455c Make tab-bar-tab-group-format-function also handle curren...
+        a3c310c11a Create new "use-package" themse and use it for :custom wit...
+        2a85d81c47 Add support for gathering statistics on use-package declar...
diff --git a/admin/codespell/codespell.ignore b/admin/codespell/codespell.ignore
index 4f145c290f7..befa845e9d8 100644
--- a/admin/codespell/codespell.ignore
+++ b/admin/codespell/codespell.ignore
@@ -1,4 +1,5 @@
 acknowledgements
+adviced
 advices
 afile
 ake
@@ -9,6 +10,8 @@ blocs
 callint
 checkin
 clen
+clos
+configury
 debbugs
 dedented
 dependant
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 1b6d9744ecc..85a8ef2624d 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -210,7 +210,10 @@ General steps (for each step, check for possible errors):
     should be committed separately, as described in step 3 above, to
     avoid them being merged to master.  The lisp/ldefs-boot.el file
     should not be merged to master either, so it could be added to the
-    same commit or committed separately.
+    same commit or committed separately.  To make sure the changes to
+    ChangeLog.N and etc/AUTHORS are _not_ skipped, do NOT describe their
+    updates as "regenerate" or "re-generate", since gitmerge.el by
+    default skips such commits; instead, use "update" or some such.
 
     The easiest way of doing that is "C-x v d ROOT-DIR RET", then go
     to the first modified file, press 'M' to mark all modified files,
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index d33f49a1aca..d873cac4269 100644
--- a/admin/notes/git-workflow
+++ b/admin/notes/git-workflow
@@ -138,6 +138,20 @@ When everything's done, look hard at the resulting merge.  Skipping
 commits requires separate merges, so don't be surprised to see more
 than one merge commit.  If you're happy, push.
 
+
+Long-lived feature branches
+===========================
+
+The conventions for formatting commit log messages set out in CONTRIBUTE
+don't apply to commits made to feature branches.
+Thus, feel free to commit little and often, with short and simple commit
+messages.  This practice can ease development by making 'git bisect' and
+'git revert' more effective.
+
+The commit merging the feature branch to master, on the other hand,
+should follow the usual commit log message conventions.
+
+
 Warnings about X11 forwarding
 =============================