procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-30

Browse source 
d953179320 Make 'jsonrpc-default-request-timeout' a defcustom
5339c6f69e ; Improve example of display-buffer-alist category in ELi...
e14007ad63 Update MS-Windows build instructions

# Conflicts:
#	etc/NEWS
This commit is contained in:
Eli Zaretskii 2024-11-30 06:35:16 -05:00
commit ffa9ad5c1f
5 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/lispref/windows.texi
View file

@ -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)))

3
etc/NEWS.30
View file

@ -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

13
lisp/jsonrpc.el
View file

@ -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'

2
nt/INSTALL.W64
View file

@ -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

23
nt/README.W32
View file

@ -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.