Merge from savannah/emacs-30

334d513220 (edebug--called-interactively-skip): Fix bug#71934
6e8b9ccaec ; * lisp/ibuffer.el (ibuffer-mode): Doc fix.
3eaf1abbff Fix MS-Windows build with native-compilation
fc375359ed Tag dbus-test05-register-signal-with-nils as unstable
99230d7080 ; * src/w32fns.c (funhook): Restore mistakenly lost line.
81a7358a33 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
b085d68396 Fix treesit test (bug#71907)
f39cf0beb7 Focus more on MS-Windows than MS-DOS in FAQ
d64396b8e4 Autoload some string functions
bd482b745a Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
b534183135 * etc/NEWS: Fix typos.
850fc68481 ; (grep-read-files): Fix completion table
2853259935 Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
921d40759e Remove a reference to a non-existant variable from a doc-...
5d2a115ab0 ; * src/fns.c (value_cmp): ASCIIfy.

doc/misc/efaq.texi

@@ -1806,7 +1806,7 @@ is better to write ``Emacs and XEmacs.''
 * Deleting menus and menu options::
 * Turning on syntax highlighting::
 * Scrolling only one line::
-* Editing MS-DOS files::
+* Editing Windows files::
 * Filling paragraphs with a single space::
 * Escape sequences in shell output::
 * Start Emacs maximized::
@@ -1874,7 +1874,7 @@ customize, with completion.
 
 Colors and faces are supported in non-windowed mode, i.e., on Unix and
 GNU/Linux text-only terminals and consoles, and when invoked as
-@samp{emacs -nw} on X, MS-DOS and MS-Windows.  Emacs automatically
+@samp{emacs -nw} on X, MS-Windows and MS-DOS.  Emacs automatically
 detects color support at startup and uses it if available.  If you
 think that your terminal supports colors, but Emacs won't use them,
 check the @code{termcap} entry for your display type for color-related
@@ -3161,22 +3161,22 @@ Alternatively, use the following Lisp form in your init file
 (setq scroll-conservatively most-positive-fixnum)
 @end lisp
 
-@node Editing MS-DOS files
-@section How can I edit MS-DOS files using Emacs?
-@cindex Editing MS-DOS files
-@cindex MS-DOS files, editing
+@node Editing Windows files
+@section How can I edit Windows files using Emacs?
 @cindex Microsoft files, editing
 @cindex Windows files, editing
+@cindex Editing MS-DOS files
+@cindex MS-DOS files, editing
 
-Detection and handling of MS-DOS (and Windows) files is performed
-transparently.  You can open MS-DOS files on a Unix system, edit it,
+Detection and handling of Windows (and MS-DOS) files is performed
+transparently.  You can open Windows files on a Unix system, edit it,
 and save it without having to worry about the file format.
 
-When editing an MS-DOS style file, the mode line will indicate that it
-is a DOS file.  On Unix and GNU/Linux systems, and also on a Macintosh,
-the string @samp{(DOS)} will appear near the left edge of the mode line;
-on DOS and Windows, where the DOS end-of-line (EOL) format is the
-default, a backslash (@samp{\}) will appear in the mode line.
+When editing a Windows style file, the mode line will indicate that it
+is a Windows file.  On GNU/Linux, Unix and macOS systems, the string
+@samp{(DOS)} will appear near the left edge of the mode line; on Windows
+and MS-DOS, where the DOS end-of-line (EOL) format is the default, a
+backslash (@samp{\}) will appear in the mode line.
 
 @node Filling paragraphs with a single space
 @section How can I tell Emacs to fill paragraphs with a single space after each period?
@@ -4539,7 +4539,7 @@ display or is invoked with @samp{emacs -nw}, you typically need to use
 @code{set-terminal-coding-system} to tell Emacs what the terminal can
 display, even after setting the language environment; otherwise
 non-@acronym{ASCII} characters will display as @samp{?}.  On other operating
-systems, such as MS-DOS and MS-Windows, Emacs queries the OS about the
+systems, such as MS-Windows and MS-DOS, Emacs queries the OS about the
 character set supported by the display, and sets up the required
 terminal coding system automatically.
 

lisp/emacs-lisp/edebug.el

@@ -4577,10 +4577,9 @@ With prefix argument, make it a temporary breakpoint."
 (add-hook 'called-interactively-p-functions
           #'edebug--called-interactively-skip)
 (defun edebug--called-interactively-skip (i frame1 frame2)
-  (when (and (memq (car-safe (nth 1 frame1)) '(lambda closure))
+  (when (and (interpreted-function-p (nth 1 frame1))
              ;; Lambda value with no arguments.
-             (null (nth (if (eq (car-safe (nth 1 frame1)) 'lambda) 1 2)
-                        (nth 1 frame1)))
+             (null (aref (nth 1 frame1) 0))
              (memq (nth 1 frame2) '(edebug-enter edebug-default-enter)))
     ;; `edebug-enter' calls itself on its first invocation.
     (let ((s 1))

lisp/emacs-lisp/subr-x.el

@@ -158,6 +158,7 @@ removed."
     (string-trim (replace-regexp-in-string blank " " string t t)
                  blank blank)))
 
+;;;###autoload
 (defun string-fill (string length)
   "Try to word-wrap STRING so that no lines are longer than LENGTH.
 Wrapping is done where there is whitespace.  If there are
@@ -172,6 +173,7 @@ result will have lines that are longer than LENGTH."
       (fill-region (point-min) (point-max)))
     (buffer-string)))
 
+;;;###autoload
 (defun string-limit (string length &optional end coding-system)
   "Return a substring of STRING that is (up to) LENGTH characters long.
 If STRING is shorter than or equal to LENGTH characters, return the
@@ -253,6 +255,7 @@ than this function."
      (end (substring string (- (length string) length)))
      (t (substring string 0 length)))))
 
+;;;###autoload
 (defun string-pad (string length &optional padding start)
   "Pad STRING to LENGTH using PADDING.
 If PADDING is nil, the space character is used.  If not nil, it
@@ -272,6 +275,7 @@ the string."
           (start (concat (make-string pad-length (or padding ?\s)) string))
           (t (concat string (make-string pad-length (or padding ?\s)))))))
 
+;;;###autoload
 (defun string-chop-newline (string)
   "Remove the final newline (if any) from STRING."
   (declare (pure t) (side-effect-free t))

lisp/ibuffer.el

@@ -2374,7 +2374,8 @@ In Ibuffer, you can conveniently perform many operations on the
 currently open buffers, in addition to filtering your view to a
 particular subset of them, and sorting by various criteria.
 
-Operations on marked buffers:
+Operations on marked buffers (see \"Marking commands\" below
+ for how to mark buffers):
 \\<ibuffer-mode-map>
   \\[ibuffer-do-save] - Save the marked buffers.
   \\[ibuffer-do-view] - View the marked buffers in the selected frame.

src/emacs.c

@@ -2168,6 +2168,10 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
   init_atimer ();
 
 #ifdef WINDOWSNT
+  /* We need to forget about libraries that were loaded during the
+     dumping process (e.g. libgccjit).  This must be done _after_
+     load_pdump.  */
+  Vlibrary_cache = Qnil;
 #ifdef HAVE_W32NOTIFY
   globals_of_w32notify ();
 #endif

src/fns.c

@@ -3052,7 +3052,7 @@ value_cmp (Lisp_Object a, Lisp_Object b, int maxdepth)
       {
 	EMACS_INT ia = XFIXNUM (a);
 	if (FIXNUMP (b))
-	  return ia < XFIXNUM (b) ? -1 : 1;   /* we know that a≠b */
+	  return ia < XFIXNUM (b) ? -1 : 1;   /* we know that a != b */
 	if (FLOATP (b))
 	  return fixnum_float_cmp (ia, XFLOAT_DATA (b));
 	if (BIGNUMP (b))

src/w32.c

@@ -10969,10 +10969,6 @@ globals_of_w32 (void)
 #endif
 
   w32_crypto_hprov = (HCRYPTPROV)0;
-
-  /* We need to forget about libraries that were loaded during the
-     dumping process (e.g. libgccjit) */
-  Vlibrary_cache = Qnil;
 }
 
 /* For make-serial-process  */

src/w32fns.c

@@ -2705,6 +2705,7 @@ funhook (int code, WPARAM w, LPARAM l)
 		      inputs[1].ki.dwFlags
 			= KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP;
 		      inputs[1].ki.time = 0;
+		      SendInput (2, inputs, sizeof (INPUT));
 		    }
 		  else if (focus != NULL)
 		    {

test/lisp/net/dbus-tests.el

@@ -796,6 +796,7 @@ is in progress."
   "Check signal registration for an own service.
 SERVICE, PATH, INTERFACE and SIGNAL are ‘nil’.  This is interpreted as a
 wildcard for the respective argument."
+  :tags '(:unstable)
   (skip-unless dbus--test-enabled-session-bus)
   (dbus-ignore-errors (dbus-unregister-service :session dbus--test-service))
 

test/src/treesit-tests.el

@@ -842,6 +842,7 @@ visible_end.)"
                                 'missing))
     (goto-char (point-max))
     (insert "]")
+    (treesit-parser-root-node parser)
     (should (treesit-node-check array-node 'outdated))))
 
 ;;; Defun navigation