From e14007ad631120a3f7521e503c8de86aca849bad Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 23 Nov 2024 15:05:17 +0200 Subject: [PATCH 1/3] Update MS-Windows build instructions * nt/INSTALL.W64: * nt/README.W32: Update the name of the MSYS2 libtree-sitter distribution. Reported by Nerd . (Bug#74429) --- nt/INSTALL.W64 | 2 +- nt/README.W32 | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) 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 3eca9e90716..e862a17d812 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 - mingw-w64-x86_64-gnutls - mingw-w64-x86_64-libjpeg-turbo - mingw-w64-x86_64-libpng - mingw-w64-x86_64-librsvg - mingw-w64-x86_64-libtiff - mingw-w64-x86_64-libxml2 + 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-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-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. From 5339c6f69eef7aaccd0570a3b70fdf0066b678bc Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 23 Nov 2024 20:27:39 +0200 Subject: [PATCH 2/3] ; Improve example of display-buffer-alist category in ELisp Reference * doc/lispref/windows.texi (Choosing Window): Use 'add-to-list' and add an example how to override display-buffer-alist entries such as 'inhibit-same-window' by matching the window using the 'category' condition (bug#74457). --- doc/lispref/windows.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index c7e575b0e4f..0c6367da057 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -2646,10 +2646,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))) From d9531793206021f1ad842cbc73df939aadf5f745 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 23 Nov 2024 22:14:57 +0200 Subject: [PATCH 3/3] Make 'jsonrpc-default-request-timeout' a defcustom * lisp/jsonrpc.el (jsonrpc-default-request-timeout): New defcustom, replaces a defconst. (jsonrpc): New customization group. * etc/NEWS: Announce the change. (Bug#74338) --- etc/NEWS | 3 +++ lisp/jsonrpc.el | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 442053fa12b..3d691cfac40 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -2133,6 +2133,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 77efcf0b590..4971e13fae3 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'