Merge from origin/emacs-30

d9531793206 Make 'jsonrpc-default-request-timeout' a defcustom
5339c6f69ee ; Improve example of display-buffer-alist category in ELi...
e14007ad631 Update MS-Windows build instructions

# Conflicts:
#	etc/NEWS

5 files changed, 33 insertions, 12 deletions

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 595ac0c2fae..adc294e4c99 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2736,10 +2736,10 @@ for example:
 
 @example
 @group
-(setopt
- display-buffer-alist
- (cons '((category . comint) (display-buffer-same-window))
-        display-buffer-alist))
+(add-to-list 'display-buffer-alist
+             '((category . comint)
+               (display-buffer-same-window)
+               (inhibit-same-window . nil)))
 
 (display-buffer (get-buffer-create "*my-shell*")
                 '(nil (category . comint)))
diff --git a/etc/NEWS.30 b/etc/NEWS.30
index fbc29206039..9f60ec7e6c3 100644
--- a/etc/NEWS.30
+++ b/etc/NEWS.30
@@ -2103,6 +2103,9 @@ The command 'makefile-switch-to-browser' command is now obsolete,
 together with related commands used in the "*Macros and Targets*"
 buffer.  We recommend using an alternative like 'imenu' instead.
 
+---
+*** 'jsonrpc-default-request-timeout' is now a defcustom.
+
 
 * New Modes and Packages in Emacs 30.1
 
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 19d1c92196f..7a53f3fc108 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -466,8 +466,17 @@ ignored."
 (define-obsolete-variable-alias 'jrpc-default-request-timeout
   'jsonrpc-default-request-timeout "28.1")
 
-(defconst jsonrpc-default-request-timeout 10
-  "Time in seconds before timing out a JSONRPC request.")
+(defgroup jsonrpc nil
+  "JSON-RPC customization."
+  :prefix "jsonrpc-"
+  :group 'comm)
+
+(defcustom jsonrpc-default-request-timeout 10
+  "Time in seconds before timing out a JSON-RPC request without response."
+  :version "30.1"
+  :type 'number
+  :safe 'numberp
+  :group 'jsonrpc)
 
 
 ;;; Specific to `jsonrpc-process-connection'
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index 9694e85f269..f3a16a2e3c0 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -60,7 +60,7 @@ packages (you can copy and paste it into the shell with Shift + Insert):
   mingw-w64-x86_64-harfbuzz \
   mingw-w64-x86_64-libgccjit \
   mingw-w64-x86_64-sqlite3 \
-  mingw-w64-x86_64-tree-sitter
+  mingw-w64-x86_64-libtree-sitter (or mingw-w64-x86_64-tree-sitter)
 
 The packages include the base developer tools (autoconf, grep, make,
 etc.), the compiler toolchain (gcc, gdb, etc.), several image
diff --git a/nt/README.W32 b/nt/README.W32
index c028dd5d3fd..1e2513310f3 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -188,15 +188,24 @@ See the end of the file for license conditions.
   where PACKAGES is the list of packages you want to install.  The
   full list is as follows:
 
-    mingw-w64-x86_64-giflib
+    base-devel
+    mingw-w64-x86_64-toolchain
+    mingw-w64-x86_64-xpm-nox
+    mingw-w64-x86_64-gmp
     mingw-w64-x86_64-gnutls
-    mingw-w64-x86_64-libjpeg-turbo
+    mingw-w64-x86_64-libtiff
+    mingw-w64-x86_64-giflib
     mingw-w64-x86_64-libpng
+    mingw-w64-x86_64-libjpeg-turbo
     mingw-w64-x86_64-librsvg
-    mingw-w64-x86_64-libtiff
-    mingw-w64-x86_64-libxml2
-    mingw-w64-x86_64-xpm-nox
+    mingw-w64-x86_64-libwebp
     mingw-w64-x86_64-lcms2
+    mingw-w64-x86_64-libxml2
+    mingw-w64-x86_64-zlib
+    mingw-w64-x86_64-harfbuzz
+    mingw-w64-x86_64-libgccjit
+    mingw-w64-x86_64-sqlite3
+    mingw-w64-x86_64-libtree-sitter (or mingw-w64-x86_64-tree-sitter)
 
   You can type any subset of this list.  When asked whether to proceed
   with installation, answer Y.