Merge from savannah/emacs-30

72cf9964f3c Inaccuracy in efaq.texi
fc48e9e8ed5 ; Fix typos in DOS Makefile scripts
9b8d754579f ; * etc/NEWS: Explain Nextstep.
8819e5a45d5 Fix treesit crash (bug#71681)
eaf2dc96c1f ; Fix SHR test on MS-Windows
57880f597c5 Delete redundant mention of `with-eval-after-load'
ea8ce984342 * doc/misc/efaq.texi (New in Emacs 30): Fix typos.
45a20d781a9 ; Fix typos in symbols
d95f039af43 Document security fixes in FAQ
d063af203c8 Add "New in Emacs 30" to FAQ
ca6b484162b ; * etc/NEWS: Move "Minibuffer and Completions"
35c46663e49 ; * etc/NEWS: Move item to "Lisp Changes".
0515b38d289 ; * etc/NEWS: Move keyboard macro items closer together.
22af3a71039 ; * etc/NEWS: More copy-edits.
000ef8876ae ; * etc/NEWS: Move items to "Incompatible Lisp Changes".
4088dc8e4ce ; * etc/NEWS: Rearrange "Incompatible Lisp Changes".
179800f36bb ; * lisp/epg.el (epg--start): Add commentary about encoding.
73898f0214c Fix non-ASCII filename operatiion on EasyPG (bug#71500)
a65b6aac6b5 Silence warning with global minor mode :predicate
f5f7343ac41 ; * etc/NEWS: Move an item to "Startup Changes"
c95066bf188 ; * etc/NEWS: Move some Lisp items to better place.
bf7db88ce1f ; * etc/NEWS: Rearrange "Editing Changes in Emacs 30.1"
000424eb9eb ; * etc/NEWS: Make touch screen support more prominent.
5b5671587fb ; * etc/NEWS: Rearrange "Changes in Emacs 30.1".
31124abdefe ; * lisp/thingatpt.el (sexp-at-point): Doc fix (bug#71777).
44f269d6e60 Fix: make 'xwidget-webkit-scroll-backward' scroll backwards
358085997c6 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
736b7cad406 Add jsdoc support to php-ts-mode in <script> element
5f3d964e397 Update to Transient v0.7.2-4-gf75bc48d

# Conflicts:
#	etc/NEWS

19 files changed, 39 insertions, 24 deletions

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 032e49840a8..6c56fd78859 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1055,7 +1055,7 @@ If DST-N is specified, use it; otherwise assume it to be the current slot."
   "Set constant VAL to current slot."
   (comp--add-const-to-relocs val)
   ;; Leave relocation index nil on purpose, will be fixed-up in final
-  ;; by `comp-finalize-relocs'.
+  ;; by `comp--finalize-relocs'.
   (comp--emit `(setimm ,(comp--slot) ,val)))
 
 (defun comp--make-curr-block (block-name entry-sp &optional addr)
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 12712cb2bc3..7006ae6c785 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -524,7 +524,8 @@ on if the hook has explicitly disabled it.
        (progn
          (put ',global-mode 'globalized-minor-mode t)
          :autoload-end
-         (defvar-local ,MODE-major-mode nil))
+         (defvar-local ,MODE-major-mode nil)
+         ,@(when predicate `((defvar ,MODE-predicate))))
        ;; The actual global minor-mode
        (define-minor-mode ,global-mode
          ,(concat (format "Toggle %s in all buffers.\n" pretty-name)
diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index dab119e8a99..1260b50b0c7 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -228,10 +228,9 @@ Usage example:
                 (when (setq command
                             (let ((current-key-remap-sequence
                                    (vector tchar)))
-                              ;; Provide an empty prompt to `t-s-t-t' so
-                              ;; that it may not repeatedly display
-                              ;; and/or disable the on-screen keyboard,
-                              ;; or move point.
+                              ;; Provide an empty prompt so that it may
+                              ;; not repeatedly display and/or disable
+                              ;; the on-screen keyboard, or move point.
                               (touch-screen-translate-touch "")))
                   (setq command (if (> (length command) 0)
                                     (aref command 0)
diff --git a/lisp/epg.el b/lisp/epg.el
index 7bec91f616d..494bdd68c41 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -676,10 +676,14 @@ callback data (if any)."
                                     :command (cons (epg-context-program context)
                                                    args)
                                     :connection-type 'pipe
-                                    :coding 'raw-text
+                                    :coding '(raw-text . nil)
                                     :filter #'epg--process-filter
                                     :stderr error-process
                                     :noquery t))))
+    ;; We encode and decode ourselves the text sent/received from gpg,
+    ;; so the below disables automatic encoding and decoding by
+    ;; subprocess communications routines.
+    (set-process-coding-system process 'raw-text 'raw-text)
     (setf (epg-context-process context) process)))
 
 (defun epg--process-filter (process input)
diff --git a/lisp/erc/erc-common.el b/lisp/erc/erc-common.el
index 3577e697515..057e7981515 100644
--- a/lisp/erc/erc-common.el
+++ b/lisp/erc/erc-common.el
@@ -363,7 +363,7 @@ instead of a `set' state, which precludes any actual saving."
 Non-nil inside an ERC module's activation (or deactivation)
 command, such as `erc-spelling-enable', when it's been called
 indirectly via the module's minor-mode toggle, i.e.,
-`erc-spelling-mode'.  Nil otherwise.  Its value is either the
+`erc-spelling-mode'.  nil otherwise.  Its value is either the
 symbol `toggle' or an integer produced by `prefix-numeric-value'.
 See Info node `(elisp) Defining Minor Modes' for more.")
 
diff --git a/lisp/frameset.el b/lisp/frameset.el
index 436e51905fb..18e2a3ac666 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -200,7 +200,7 @@ Properties can be set with
 ;; - can be ignored by window managers (most positional args, like `height',
 ;;   `width', `left' and `top', and others, like `auto-raise', `auto-lower')
 ;; - can be set externally in X resources or Window registry (again, most
-;;   positional parameters, and also `toolbar-lines', `menu-bar-lines' etc.)
+;;   positional parameters, and also `tool-bar-lines', `menu-bar-lines' etc.)
 ;, - can contain references to live objects (`buffer-list', `minibuffer') or
 ;;   code (`buffer-predicate')
 ;; - are set automatically, and cannot be changed (`window-id', `parent-id'),
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index 727ace84463..bd96556846f 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -1778,7 +1778,7 @@ shown below.
 
 #+PROPERTY: var foo=1, bar=2
 
-HEADER-ARGUMENTS is alist of all the arguments."
+HEADER-ARGUMENTS is an alist of all the arguments."
   (let (results)
     (mapc (lambda (pair)
             (if (eq (car pair) :var)
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index a8d85ce7c85..ef747d9bb2c 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -160,7 +160,7 @@ Otherwise, execute block according to header settings."
     (org-babel-lilypond-process-basic body params)))
 
 (defun org-babel-lilypond-tangle ()
-  "Tangle lilypond blocks, then `org-babel-liypond-execute-tangled-ly'."
+  "Tangle lilypond blocks, then `org-babel-lilypond-execute-tangled-ly'."
   (interactive)
   (if (org-babel-tangle nil "yes" "lilypond")
       (org-babel-lilypond-execute-tangled-ly) nil))
diff --git a/lisp/org/org-refile.el b/lisp/org/org-refile.el
index c8e64903c33..391e2402859 100644
--- a/lisp/org/org-refile.el
+++ b/lisp/org/org-refile.el
@@ -557,7 +557,7 @@ prefix argument (`C-u C-u C-u C-c C-w')."
             (let ((origin (point-marker)))
               ;; Handle special case when we refile to exactly same
               ;; location with tree promotion/demotion.  Point marker
-              ;; saved by `org-width-wide-buffer' (`save-excursion')
+              ;; saved by `org-with-wide-buffer' (`save-excursion')
               ;; will then remain before the inserted subtree in
               ;; unexpected location.
               (set-marker-insertion-type origin t)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 0b50844732f..7dc850cb839 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -13864,7 +13864,7 @@ comment at the start of cc-engine.el for more info."
   ;;
   ;; This is true when point is at the last non syntactic WS position on the
   ;; line, there is a macro call last on the line, and this particular macro's
-  ;; name is defined by the regexp `c-vs-macro-regexp' as not needing a
+  ;; name is defined by the regexp `c-macro-with-semi-re' as not needing a
   ;; semicolon.
   (save-excursion
     (save-restriction
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index b8ca1f2d600..686555221cb 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -500,7 +500,6 @@ Variables controlling indentation style and extra features:
  dcl-imenu-label-call
     Change the text that is used as sub-listing labels in imenu.
 
-To run code after DCL mode has loaded, use `with-eval-after-load'.
 Turning on DCL mode calls the value of the variable `dcl-mode-hook'
 with no args, if that value is non-nil.
 
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 37b3a5f190b..a8a0495ab11 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -851,7 +851,7 @@ Return the buffer created."
 For each member, a symbol is added to the table.  Members are
 extracted from the buffer-local tree `ebrowse--tree-table'.
 
-Each symbol has its property `ebrowse-info' set to a list (TREE MEMBER-LIST
+Each symbol has its property `ebrowse-tree' set to a list (TREE MEMBER-LIST
 MEMBER) where TREE is the tree in which the member is defined,
 MEMBER-LIST is a symbol describing the member list in which the member
 is found, and MEMBER is a MEMBER structure describing the member.
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index df4cbe50dc0..bb6b0281d9f 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2544,7 +2544,7 @@ THINGS are either registrations or unregisterations (sic)."
 
 (defun eglot--TextDocumentIdentifier ()
   "Compute TextDocumentIdentifier object for current buffer.
-Sets `eglot--TextDocumentIdentifier-uri' (which see) as a side effect."
+Sets `eglot--TextDocumentIdentifier-cache' (which see) as a side effect."
   (unless eglot--TextDocumentIdentifier-cache
     (let ((truename (file-truename (or buffer-file-name
                                        (ignore-errors
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index c8b086cfad2..0ce5e1df794 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -5122,7 +5122,7 @@ commands) or source buffers (that display program source code)."
 
 (defun gdb--buffer-type (buffer)
   "Return the type of BUFFER if it is a function buffer.
-Buffer type is like `gdb-registers-type', `gdb-stack-buffer'.
+Buffer type is like `gdb-registers-buffer', `gdb-stack-buffer'.
 These symbols are used by `gdb-get-buffer-create'.
 
 Return nil if BUFFER is not a GDB function buffer."
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 826c131ca70..1298b39311b 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -36,6 +36,7 @@
 ;; * https://github.com/tree-sitter/tree-sitter-php
 ;; * https://github.com/tree-sitter/tree-sitter-html
 ;; * https://github.com/tree-sitter/tree-sitter-javascript
+;; * https://github.com/tree-sitter/tree-sitter-jsdoc
 ;; * https://github.com/tree-sitter/tree-sitter-css
 ;; * https://github.com/claytonrcarter/tree-sitter-phpdoc
 ;;
@@ -86,6 +87,7 @@
     (phpdoc . ("https://github.com/claytonrcarter/tree-sitter-phpdoc"))
     (html . ("https://github.com/tree-sitter/tree-sitter-html"  "v0.20.3"))
     (javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.21.2"))
+    (jsdoc . ("https://github.com/tree-sitter/tree-sitter-jsdoc" "v0.21.0"))
     (css . ("https://github.com/tree-sitter/tree-sitter-css" "v0.21.0")))
   "Treesitter language parsers required by `php-ts-mode'.
 You can customize this variable if you want to stick to a specific
@@ -1296,6 +1298,7 @@ Depends on `c-ts-common-comment-setup'."
             (treesit-ready-p 'phpdoc)
             (treesit-ready-p 'html)
             (treesit-ready-p 'javascript)
+            (treesit-ready-p 'jsdoc)
             (treesit-ready-p 'css)))
       (error "Tree-sitter for PHP isn't
     available.  You can install the parsers with M-x
@@ -1334,6 +1337,12 @@ Depends on `c-ts-common-comment-setup'."
                     (start_tag (tag_name))
                     (raw_text) @cap))
 
+                 :embed 'jsdoc
+                 :host 'javascript
+                 :local t
+                 `(((comment) @cap
+                    (:match ,js--treesit-jsdoc-beginning-regexp @cap)))
+
                  :embed 'css
                  :host 'html
                  :offset '(1 . -1)
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index a593b6c6241..3cfd3905701 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -778,7 +778,10 @@ Signal an error if the entire string was not used."
 
 ;;;###autoload
 (defun sexp-at-point ()
-  "Return the sexp at point, or nil if none is found."
+  "Return the sexp at point, or nil if none is found.
+This is for returning the Lisp object represented by text at point;
+use (thing-at-point \\='sexp) instead if you rather want the balanced
+expression at point regardless of Lisp syntax."
   (form-at-point 'sexp))
 ;;;###autoload
 (defun symbol-at-point ()
diff --git a/lisp/transient.el b/lisp/transient.el
index 805b0acd6f3..312ed540f73 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -2550,7 +2550,10 @@ value.  Otherwise return CHILDREN as is."
                  (transient--pop-keymap 'transient--redisplay-map)
                  (setq transient--redisplay-map new)
                  (transient--push-keymap 'transient--redisplay-map))
-               (transient--redisplay)))))))
+               (transient--redisplay)))))
+    (setq transient-current-prefix nil)
+    (setq transient-current-command nil)
+    (setq transient-current-suffixes nil)))
 
 (defun transient--post-exit (&optional command)
   (transient--debug 'post-exit)
@@ -2573,9 +2576,6 @@ value.  Otherwise return CHILDREN as is."
     (remove-hook 'pre-command-hook  #'transient--pre-command)
     (remove-hook 'post-command-hook #'transient--post-command)
     (advice-remove 'recursive-edit #'transient--recursive-edit))
-  (setq transient-current-prefix nil)
-  (setq transient-current-command nil)
-  (setq transient-current-suffixes nil)
   (let ((resume (and transient--stack
                      (not (memq transient--exitp '(replace suspend))))))
     (unless (or resume (eq transient--exitp 'replace))
diff --git a/lisp/which-key.el b/lisp/which-key.el
index 8ad2ba2c365..677a84b328d 100644
--- a/lisp/which-key.el
+++ b/lisp/which-key.el
@@ -1614,7 +1614,7 @@ Within these categories order using `which-key-key-order'."
     (when found `(replaced . ,key-binding))))
 
 (defun which-key--maybe-replace (key-binding)
-  "Use `which-key--replacement-alist' to maybe replace KEY-BINDING.
+  "Use `which-key-replacement-alist' to maybe replace KEY-BINDING.
 KEY-BINDING is a cons cell of the form \(KEY . BINDING\) each of
 which are strings.  KEY is of the form produced by `key-binding'."
   (let* ((replacer (if which-key-allow-multiple-replacements
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index cca01c8cb3a..bf5987d742f 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -378,7 +378,7 @@ one char."
              (> (window-hscroll) 0))
         (set-window-hscroll nil (- (window-hscroll) n))
       (xwidget-webkit-execute-script session
-                                     (format "window.scrollBy(%-d, 0);"
+                                     (format "window.scrollBy(-%d, 0);"
                                              (* n (window-font-width)))))))
 
 (defun xwidget-webkit-scroll-top ()