From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 31 Jul 2023 15:11:21 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=555cb8f7b13f5f364f55024c21551ef00f810e19;p=emacs.git

Merge from origin/emacs-29

ee20b50dfed ; * lisp/progmodes/typescript-ts-mode.el (treesit-query-c...
2215298d90b Update JSX support due to upstream changes (bug#64647)
235561a2ccc Update TSX support due to upstream changes (bug#64647)
12ab82d3b35 ; Fix customization form of 'bookmark-watch-bookmark-file'
d149a4dc428 ; Improve documentation of automatic addition to minibuff...
42a99627948 ; Improve documentation of 'last-command-event'
101455cb853 ; * lisp/subr.el (ignore, always): Doc fixes.  (Bug#64776)
---

555cb8f7b13f5f364f55024c21551ef00f810e19
diff --cc lisp/subr.el
index 2e2caf9fe27,872c701dbe7..9949bf8d729
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@@ -423,20 -399,17 +423,20 @@@ PREFIX is a string, and defaults to \"g
      (make-symbol (format "%s%d" (or prefix "g") num))))
  
  (defun ignore (&rest _arguments)
-   "Do nothing and return nil.
- This function accepts any number of ARGUMENTS, but ignores them.
+   "Ignore ARGUMENTS, do nothing, and return nil.
+ This function accepts any number of arguments in ARGUMENTS.
  Also see `always'."
 -  (declare (completion ignore))
 +  ;; Not declared `side-effect-free' because we don't want calls to it
 +  ;; elided; see `byte-compile-ignore'.
 +  (declare (pure t) (completion ignore))
    (interactive)
    nil)
  
  (defun always (&rest _arguments)
-   "Do nothing and return t.
- This function accepts any number of ARGUMENTS, but ignores them.
+   "Ignore ARGUMENTS, do nothing, and return t.
+ This function accepts any number of arguments in ARGUMENTS.
  Also see `ignore'."
 +  (declare (pure t) (side-effect-free error-free))
    t)
  
  ;; Signal a compile-error if the first arg is missing.