mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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
Download patch file Download diff file Expand all files Collapse all files

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'